Commit: 5b4404a0b92a326ff6eab747dd514e2bd26485a6 - zandronum-macos (hg)

This is a fork of Zandronum for Mac Os (Silicon and Intel)

Commit MetaInfo

• Revision: 5b4404a0b92a326ff6eab747dd514e2bd26485a6 (tree)
• Time: 2021-11-15 06:07:28
• Author: Joshua Surace <doomjoshuaboy@live...>
• Commiter: Joshua Surace

Log Message

Cmake fixes

Change Summary

• modified: src/CMakeLists.txt

Incremental Difference

diff -r f10481955d4d -r 5b4404a0b92a src/CMakeLists.txt
--- a/src/CMakeLists.txt	Thu Nov 11 17:50:07 2021 +1100
+++ b/src/CMakeLists.txt	Mon Nov 15 08:07:28 2021 +1100
@@ -332,7 +332,7 @@
         message( STATUS "Could not find FMOD library" )
         set( NO_FMOD ON )
     endif( FMOD_LIBRARY )
-endif( NO_SOUND )
+endif( NOT NO_SOUND )
 
 # Search for FluidSynth
 
@@ -646,6 +646,9 @@
 set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${GME_LIBRARIES}" )
 # [BB] Without sound, we don't need FMOD.
 if ( NOT NO_SOUND )
+    set( ZDOOM_LIBS ${ZDOOM_LIBS} "${FMOD_LIBRARY}" )
+    include_directories( "${ZLIB_INCLUDE_DIR}" "${FMOD_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" )
+    else ( NOT NO_SOUND )
 if( NOT DYN_FLUIDSYNTH)
     if( FLUIDSYNTH_FOUND )
         set( ZDOOM_LIBS ${ZDOOM_LIBS} "${FLUIDSYNTH_LIBRARIES}" )
@@ -757,12 +760,9 @@
 		set( SYSTEM_SOURCES ${SYSTEM_SOURCES} ${PLAT_MAC_SOURCES} )
 		set( OTHER_SYSTEM_SOURCES ${PLAT_WIN32_SOURCES} )
         set_source_files_properties( sdl/osx/zandronum.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources )
-        set_source_files_properties( sdl/iwadpicker_cocoa.mm PROPERTIES COMPILE_FLAGS -fobjc-exceptions )
-        set_target_properties(zdoom PROPERTIES XCODE_EMBED_FRAMEWORKS  "${SDL2_LIBRARY}")
+        set_source_files_properties( sdl/osx/iwadpicker_cocoa.mm PROPERTIES COMPILE_FLAGS -fobjc-exceptions )
         set_source_files_properties("${SDL2_LIBRARY}" PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks)
         set_source_files_properties("${FMOD_LIBRARY}" PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks)
-        set_source_files_properties(DIRECTORY "${HOME}/Documents/Zandronum/announcer PROPERTIES MACOSX_PACKAGE_LOCATION MacOS)
-        set_source_files_properties(DIRECTORY "${HOME}/Documents/Zandronum/skins PROPERTIES MACOSX_PACKAGE_LOCATION MacOS)
     else( APPLE )
 		set( OTHER_SYSTEM_SOURCES ${PLAT_WIN32_SOURCES} ${PLAT_MAC_SOURCES} )
 	endif( APPLE )