Browse Source

Adding PortAudio for audio backend.

Well that just the beginning!
Godzil 6 years ago
parent
commit
cfe0099595
6 changed files with 16 additions and 2 deletions
  1. 3 0
      .gitmodules
  2. 7 0
      CMakeLists.txt
  3. 1 0
      external/portaudio
  4. 2 2
      src/CMakeLists.txt
  5. 1 0
      src/apu/CMakeLists.txt
  6. 2 0
      src/os/unix/graphics.c

+ 3 - 0
.gitmodules

@@ -4,3 +4,6 @@
 [submodule "external/coveralls-cmake"]
 	path = external/coveralls-cmake
 	url = https://github.com/JoakimSoderberg/coveralls-cmake.git
+[submodule "external/portaudio"]
+	path = external/portaudio
+	url = https://git.assembla.com/portaudio.git

+ 7 - 0
CMakeLists.txt

@@ -16,6 +16,7 @@ project (TINES)
 # External cmake modules
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/external/cmake ${CMAKE_MODULE_PATH})
 
+# Include GLFW
 set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
 set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
 set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
@@ -24,6 +25,12 @@ find_package(OpenGL REQUIRED)
 
 include_directories(${OPENGL_INCLUDE_DIR})
 
+# Include PortAudio
+set(PA_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+set(PA_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+set(PA_ENABLE_DEBUG_OUTPUT OFF CACHE BOOL "" FORCE)
+add_subdirectory("external/portaudio")
+
 if (COVERALLS)
     enable_testing()
 endif (COVERALLS)

+ 1 - 0
external/portaudio

@@ -0,0 +1 @@
+Subproject commit 1bdcb9e41357ec76d8cf73f9ef278202a3ea1e3b

+ 2 - 2
src/CMakeLists.txt

@@ -33,6 +33,8 @@ set (CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused-parameter -Wno-unused-result -We
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/external/coveralls-cmake/cmake)
 
+add_executable(tines main.c paddle.c NESCarts.c)
+
 add_definitions (-DNO_DECIMAL)
 
 if (PPU_ISPAL)
@@ -99,8 +101,6 @@ if (COVERALLS)
         ) # (Optional) Alternate project cmake module path.
 endif()
 
-
-add_executable(tines main.c paddle.c NESCarts.c)
 target_link_libraries(tines apu corecpu mappermanager memorymanager pluginsmanager ppu oslib ${PTHREADLIB})
 
 add_test(NAME tines_test COMMAND $<TARGET_FILE:tines> ${PROJECT_SOURCE_DIR}/data/bad_apple_2.nes)

+ 1 - 0
src/apu/CMakeLists.txt

@@ -11,3 +11,4 @@
 
 add_library(apu SndUnixT.c Sound.c)
 #add_library(apu SndAlleg.c Sound.c)
+target_link_libraries(apu portaudio_static)

+ 2 - 0
src/os/unix/graphics.c

@@ -188,6 +188,8 @@ void initDisplay(GLWindow *g)
       abort();
    }
 
+   glfwSetWindowAspectRatio(g->windows, 4, 3);
+
    glfwMakeContextCurrent(g->windows);
    setupGL(g, g->WIDTH, g->HEIGHT);