diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ed5d062..b0c481b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,23 +35,23 @@ find_package(OpenGL REQUIRED) find_package(GLEW REQUIRED) # SDL2 ------------------------------------------------------------------------ -# if (UNIX) -# add_subdirectory(src/lib/SDL) -# else() +if (UNIX) + add_subdirectory(src/lib/SDL) +else() find_package(SDL2) -# endif() -# set(SDL2MIXER_OPUS OFF) -# set(SDL2MIXER_FLAC OFF) -# set(SDL2MIXER_MOD OFF) -# set(SDL2MIXER_MIDI_FLUIDSYNTH OFF) -# find_library(SDL_MIXER_LIBRARY -# NAMES SDL_mixer -# HINTS -# ENV SDLMIXERDIR -# ENV SDLDIR -# PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX} -# ) -# add_subdirectory(src/lib/SDL_mixer) +endif() +set(SDL2MIXER_OPUS OFF) +set(SDL2MIXER_FLAC OFF) +set(SDL2MIXER_MOD OFF) +set(SDL2MIXER_MIDI_FLUIDSYNTH OFF) +find_library(SDL_MIXER_LIBRARY + NAMES SDL_mixer + HINTS + ENV SDLMIXERDIR + ENV SDLDIR + PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX} + ) +add_subdirectory(src/lib/SDL_mixer) # Asar ------------------------------------------------------------------------ add_subdirectory(src/lib/asar/src)