Skip to content

Commit

Permalink
Merge pull request #170 from ZoriaRPG/2.50.x
Browse files Browse the repository at this point in the history
Fix: Update CMakeLists.txt with winmm.lib dependency on win32.
  • Loading branch information
ZoriaRPG committed Oct 15, 2017
2 parents 800eb35 + 087981c commit 31b2f7e
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,12 @@ target_link_libraries(romview ${IMAGELIBS} ${ALLEGROLIB} ${SOUNDLIBS} ${ROMVIEWL
# Zelda
#############################################################




if(MSVC)
list(APPEND ZELDAEXTRASOURCES zc_icon.rc)

elseif(LINUX)
list(APPEND ZELDAEXTRASOURCES zc_icon.c src/single_instance_unix.cpp)
set(ZELDALIBSEXTRA ${X11_LIBRARIES})
Expand All @@ -204,7 +208,13 @@ endif()

add_executable(zelda ${ZELDA_CORE_SOURCES} ${ZELDA_GUI_SOURCES} ${ZELDA_SPRITE_SOURCES} ${ZELDA_SUBSCREEN_SOURCES} ${ZELDA_SCRIPTING_SOURCES} ${ZELDAEXTRASOURCES} ${ZELDA_MODULES})

target_link_libraries(zelda zcsound ${IMAGELIBS} ${ALLEGROLIB} ${ZELDALIBSEXTRA})
if(WIN32)
target_link_libraries(zelda zcsound winmm ${IMAGELIBS} ${ALLEGROLIB} ${ZELDALIBSEXTRA})
elseif(LINUX)
target_link_libraries(zelda zcsound ${IMAGELIBS} ${ALLEGROLIB} ${ZELDALIBSEXTRA})
endif()


if(MSVC AND USE_PCH)
set_target_properties(zelda PROPERTIES COMPILE_FLAGS "/Yuprecompiled.h /FIprecompiled.h /Fp\"${ZCPrecompiledBinary}\"" OBJECT_DEPENDS "${ZCPrecompiledBinary}")
target_compile_definitions(zelda PRIVATE ZC_PCH)
Expand Down

0 comments on commit 31b2f7e

Please sign in to comment.