godzil/ti-nesulator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding PortAudio for audio backend.

Browse Source 
Well that just the beginning!
This commit is contained in:
Godzil 2018-01-30 19:05:50 +00:00
parent e96f36b6de
commit cfe0099595
6 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

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

7
CMakeLists.txt
View File

@ -16,6 +16,7 @@ project (TINES)
# External cmake modules # External cmake modules
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/external/cmake ${CMAKE_MODULE_PATH}) 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_DOCS OFF CACHE BOOL "" FORCE)
set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE) set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
set(GLFW_BUILD_EXAMPLES 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_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) if (COVERALLS)
enable_testing() enable_testing()
endif (COVERALLS) endif (COVERALLS)

1
external/portaudio vendored Submodule

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

4
src/CMakeLists.txt
View File

@ -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) 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) add_definitions (-DNO_DECIMAL)
if (PPU_ISPAL) if (PPU_ISPAL)
@ -99,8 +101,6 @@ if (COVERALLS)
) # (Optional) Alternate project cmake module path. ) # (Optional) Alternate project cmake module path.
endif() endif()
add_executable(tines main.c paddle.c NESCarts.c)
target_link_libraries(tines apu corecpu mappermanager memorymanager pluginsmanager ppu oslib ${PTHREADLIB}) 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) add_test(NAME tines_test COMMAND $<TARGET_FILE:tines> ${PROJECT_SOURCE_DIR}/data/bad_apple_2.nes)

1
src/apu/CMakeLists.txt
View File

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

2
src/os/unix/graphics.c
View File

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