X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FCMakeLists.txt;h=5363642c3a8005b5871ffa13914c7da6af9a3cf0;hb=6ead77cb4ea50fe5e852f70addcb3f28919740a0;hp=3aba8d7b0ac47575d4b6106c9a520cfd8385ba85;hpb=2fea8aa4d67ff70b015a34eb058a5e598b3d737d;p=lugaru.git diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 3aba8d7..5363642 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -62,6 +62,7 @@ set(LUGARU_H Game.h Lights.h LinkedList.h + MacCompatibility.h Models.h Objects.h Person.h @@ -100,28 +101,34 @@ if(CMAKE_HOST_APPLE) set(LUGARU_H ${LUGARU_H} "Carbon Include.h" - MacCompatibility.h CarbonStdCLib.h) endif(CMAKE_HOST_APPLE) +if(CMAKE_HOST_UNIX) + set(LUGARU_SRCS + ${LUGARU_SRCS} + MacCompatibility.cpp) +endif(CMAKE_HOST_UNIX) + + if(WIN32) - if(CMAKE_CROSSCOMPILING) - ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj - COMMAND i686-pc-mingw32-windres - -I${CMAKE_CURRENT_SOURCE_DIR}/res - -o ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj - -i${CMAKE_CURRENT_SOURCE_DIR}/res/lugaru.rc - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/res/lugaru.rc - ) - endif(CMAKE_CROSSCOMPILING) - if(NOT CMAKE_CROSSCOMPILING) - ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj - COMMAND windres - -I${CMAKE_CURRENT_SOURCE_DIR}/res - -o ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj - -i${CMAKE_CURRENT_SOURCE_DIR}/res/lugaru.rc - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/res/lugaru.rc - ) + if(CMAKE_CROSSCOMPILING) + ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj + COMMAND i686-pc-mingw32-windres + -I${CMAKE_CURRENT_SOURCE_DIR}/res + -o ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj + -i${CMAKE_CURRENT_SOURCE_DIR}/res/lugaru.rc + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/res/lugaru.rc + ) + endif(CMAKE_CROSSCOMPILING) + if(NOT CMAKE_CROSSCOMPILING) + ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj + COMMAND windres + -I${CMAKE_CURRENT_SOURCE_DIR}/res + -o ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj + -i${CMAKE_CURRENT_SOURCE_DIR}/res/lugaru.rc + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/res/lugaru.rc + ) endif(NOT CMAKE_CROSSCOMPILING) set(LUGARU_SRCS