Skip to content

Make sure to add SDL's library directory before building SDL things. #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bentley wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make sure to add SDL's library directory before building SDL things. #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions a2play/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
include_directories(${AUDIALITY2_BINARY_DIR}/include)
include_directories(${AUDIALITY2_SOURCE_DIR}/include)
link_directories(${AUDIALITY2_BINARY_DIR})
pkg_search_module(SDL2 sdl2)
link_directories(${SDL2_LIBDIR})

set(AUDIALITY2_LIBRARY audiality2)

Expand Down
1 change: 1 addition & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ if(SDL_FOUND)
elseif(SDL2_FOUND)
add_definitions(-DA2_HAVE_SDL)
include_directories(${SDL2_INCLUDE_DIRS})
link_directories(${SDL2_LIBDIR})
endif(SDL_FOUND)

if(USE_JACK)
Expand Down
25 changes: 13 additions & 12 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,6 @@ function(a2_add_test testname)
endif(FORCE_32BIT)
endfunction(a2_add_test)

a2_add_test(waveupload)
a2_add_test(rtsubstate)
a2_add_test(renderwave)
a2_add_test(renderwave2)
a2_add_test(streamupload)
a2_add_test(wavestress)
a2_add_test(wavestress2)
a2_add_test(voicestress)
a2_add_test(streamtest)
a2_add_test(streamstress)
a2_add_test(timingtest)

if(SDL_FOUND)
include_directories(${SDL_INCLUDE_DIR})
a2_add_test(a2test gui.c)
Expand All @@ -38,10 +26,23 @@ if(SDL_FOUND)
target_link_libraries(apistress SDLmain)
elseif(SDL2_FOUND)
include_directories(${SDL2_INCLUDE_DIRS})
link_directories(${SDL2_LIBDIR})
a2_add_test(a2test gui.c)
a2_add_test(apistress)
endif(SDL_FOUND)

a2_add_test(waveupload)
a2_add_test(rtsubstate)
a2_add_test(renderwave)
a2_add_test(renderwave2)
a2_add_test(streamupload)
a2_add_test(wavestress)
a2_add_test(wavestress2)
a2_add_test(voicestress)
a2_add_test(streamtest)
a2_add_test(streamstress)
a2_add_test(timingtest)

# Release build: full optimization, no debug features, no debug info
set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG")

Expand Down