From 64e34d883b74db7a3868cd81ba9556dac4ce9138 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Mon, 17 Nov 2014 14:54:46 +0200 Subject: [PATCH] Fixed build on UNIX systems other than OS X --- src/CMakeLists.txt | 9 ++++++--- src/sdl/i_timer.cpp | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index af323f5b3..fb1eab35a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -593,15 +593,18 @@ set( PLAT_COCOA_SOURCES cocoa/zdoom.icns ) if( APPLE ) + set( PLAT_SDL_SOURCES ${PLAT_SDL_SYSTEM_SOURCES} "${FMOD_LIBRARY}" ) + if( OSX_COCOA_BACKEND ) - set( PLAT_SDL_SOURCES ${PLAT_SDL_SYSTEM_SOURCES} ${PLAT_COCOA_SOURCES} "${FMOD_LIBRARY}" ) + set( PLAT_MAC_SOURCES ${PLAT_MAC_SOURCES} ${PLAT_COCOA_SOURCES} ) else( OSX_COCOA_BACKEND ) - set( PLAT_SDL_SOURCES ${PLAT_SDL_SYSTEM_SOURCES} ${PLAT_SDL_SPECIAL_SOURCES} "${FMOD_LIBRARY}" ) - set( PLAT_MAC_SOURCES ${PLAT_MAC_SOURCES} sdl/SDLMain.m ) + set( PLAT_MAC_SOURCES ${PLAT_MAC_SOURCES} ${PLAT_SDL_SPECIAL_SOURCES} sdl/SDLMain.m ) endif( OSX_COCOA_BACKEND ) set_source_files_properties( cocoa/zdoom.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources ) set_source_files_properties( "${FMOD_LIBRARY}" PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks ) +else( APPLE ) + set( PLAT_SDL_SOURCES ${PLAT_SDL_SYSTEM_SOURCES} ${PLAT_SDL_SPECIAL_SOURCES} ) endif( APPLE ) if( WIN32 ) diff --git a/src/sdl/i_timer.cpp b/src/sdl/i_timer.cpp index 1b73edd5b..e3f9906b6 100644 --- a/src/sdl/i_timer.cpp +++ b/src/sdl/i_timer.cpp @@ -2,6 +2,7 @@ // Moved from sdl/i_system.cpp #include +#include #include #include