Adding PortAudio for audio backend.
Well that just the beginning!
This commit is contained in:
parent
e96f36b6de
commit
cfe0099595
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -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
|
||||
|
||||
@ -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
external/portaudio
vendored
Submodule
1
external/portaudio
vendored
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 1bdcb9e41357ec76d8cf73f9ef278202a3ea1e3b
|
||||
@ -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)
|
||||
|
||||
@ -11,3 +11,4 @@
|
||||
|
||||
add_library(apu SndUnixT.c Sound.c)
|
||||
#add_library(apu SndAlleg.c Sound.c)
|
||||
target_link_libraries(apu portaudio_static)
|
||||
|
||||
@ -188,6 +188,8 @@ void initDisplay(GLWindow *g)
|
||||
abort();
|
||||
}
|
||||
|
||||
glfwSetWindowAspectRatio(g->windows, 4, 3);
|
||||
|
||||
glfwMakeContextCurrent(g->windows);
|
||||
setupGL(g, g->WIDTH, g->HEIGHT);
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user