X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=CMakeLists.txt;h=c7bc8f42a10d1e5475a88c51b33d88c6cc9ca52c;hb=f171db5acc3f7a0837597fe66b8e034508a76ef5;hp=fe0c1d68708892192cffcf20d5941468c27d7127;hpb=bcb5d4e54bc4169c31209a62cd3ddb45a6538101;p=lugaru.git diff --git a/CMakeLists.txt b/CMakeLists.txt index fe0c1d6..c7bc8f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,12 +25,10 @@ endif(NOT LUGARU_INSTALL_PREFIX) set(CMAKE_INSTALL_PREFIX "${LUGARU_INSTALL_PREFIX}" CACHE INTERNAL "Prefix prepended to install directories" FORCE) -if(WIN32) +if(MINGW) set(OPENGL_gl_LIBRARY "-lopengl32" CACHE STRING "OpenGL library for Win32" FORCE) set(OPENGL_glu_LIBRARY "-lglu32" CACHE STRING "GLU library for Win32" FORCE) -endif(WIN32) - - +endif(MINGW) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") @@ -63,20 +61,12 @@ set(LUGARU_SRCS ${SRCDIR}/WinInput.cpp ) -if(UNIX) - set(LUGARU_SRCS - ${LUGARU_SRCS} - ${SRCDIR}/MacCompatibility.cpp - ) -endif(UNIX) - set(LUGARU_H ${SRCDIR}/Constants.h ${SRCDIR}/Frustum.h ${SRCDIR}/Game.h ${SRCDIR}/Lights.h ${SRCDIR}/LinkedList.h - ${SRCDIR}/MacCompatibility.h ${SRCDIR}/Models.h ${SRCDIR}/Objects.h ${SRCDIR}/Person.h @@ -97,7 +87,6 @@ set(LUGARU_H ${SRCDIR}/openal_wrapper.h ${SRCDIR}/gamegl.h ${SRCDIR}/glstubs.h - ${SRCDIR}/md5.h ${SRCDIR}/mmgr.h ${SRCDIR}/nommgr.h ${SRCDIR}/pack_private.h @@ -105,6 +94,25 @@ set(LUGARU_H ${SRCDIR}/unpack_private.h ) +if(UNIX) + set(LUGARU_SRCS + ${LUGARU_SRCS} + ${SRCDIR}/MacCompatibility.cpp + ) + set(LUGARU_H + ${LUGARU_H} + ${SRCDIR}/MacCompatibility.h + ) +endif(UNIX) + +if(MSVC) # MSVC non-C99 support biting us hard + set(LUGARU_H + ${LUGARU_H} + ${DEPDIR}/msinttypes/stdint.h + ${DEPDIR}/msinttypes/inttypes.h + ) +endif(MSVC) + if(WIN32) if(CMAKE_CROSSCOMPILING) ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj @@ -116,6 +124,16 @@ if(WIN32) ) endif(CMAKE_CROSSCOMPILING) if(NOT CMAKE_CROSSCOMPILING) + if(MSVC) + ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj + COMMAND rc + -I${SRCDIR}/res + -fo${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj + ${SRCDIR}/res/Lugaru.rc + DEPENDS ${SRCDIR}/res/Lugaru.rc + ) + endif(MSVC) + if(MINGW) ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj COMMAND windres -I${SRCDIR}/res @@ -123,6 +141,7 @@ if(WIN32) -i${SRCDIR}/res/Lugaru.rc DEPENDS ${SRCDIR}/res/Lugaru.rc ) + endif(MINGW) endif(NOT CMAKE_CROSSCOMPILING) # !!! FIXME: get rid of this. @@ -140,22 +159,22 @@ if (APPLE) set(PLATFORM_LIBS "-framework Carbon -framework Cocoa -framework OpenGL -framework OpenAL") endif (APPLE) - - # Deal with dependencies... - find_package(OpenGL REQUIRED) # force this include dir no matter what, so we get sane headers. -include_directories("${DEPDIR}/OpenGL") +option (LUGARU_FORCE_INTERNAL_OPENGL "Force internal OpenGL headers, even if there's a system version" True) +if (LUGARU_FORCE_INTERNAL_OPENGL) + include_directories("${DEPDIR}/OpenGL") +endif (LUGARU_FORCE_INTERNAL_OPENGL) option (LUGARU_FORCE_INTERNAL_OPENAL "Force internal libOpenAL, even if there's a system version" False) if (NOT LUGARU_FORCE_INTERNAL_OPENAL) - find_package(OpenAL REQUIRED) + find_package(OpenAL REQUIRED) else(NOT LUGARU_FORCE_INTERNAL_OPENAL) set(OPENAL_FOUND False) endif (NOT LUGARU_FORCE_INTERNAL_OPENAL) -if (NOT OPENAL_FOUND) +if (NOT OPENAL_FOUND OR LUGARU_FORCE_INTERNAL_OPENAL) message(STATUS "Using internal copy of OpenAL") set(LUGARU_MISSING_DEPS "${LUGARU_MISSING_DEPS} OpenAL") set(OPENALDIR "${DEPDIR}/OpenAL") @@ -164,11 +183,16 @@ if (NOT OPENAL_FOUND) if (WIN32) set(LUGARU_HAS_INTERNAL_OPENAL True) -# if (MSVC) # !!! FIXME: package MSVC .dll and .lib for Windows? -# set(OPENAL_LIBRARY -# ${OPENALDIR}/lib/win32/msvc/OpenAL32.lib -# ) -# endif (MSVC) + if (MSVC80) + set(OPENAL_LIBRARY + ${OPENALDIR}/lib/win32/msvc2005/OpenAL32.lib + ) + endif (MSVC80) + if (MSVC90) + set(OPENAL_LIBRARY + ${OPENALDIR}/lib/win32/msvc2008/OpenAL32.lib + ) + endif (MSVC90) if (MINGW) set(OPENAL_LIBRARY ${OPENALDIR}/lib/win32/mingw/libOpenAL32.dll.a @@ -179,7 +203,7 @@ if (NOT OPENAL_FOUND) if (NOT LUGARU_HAS_INTERNAL_OPENAL) message(ERROR "We don't have a prebuilt OpenAL for this platform.") endif (NOT LUGARU_HAS_INTERNAL_OPENAL) -endif (NOT OPENAL_FOUND) +endif (NOT OPENAL_FOUND OR LUGARU_FORCE_INTERNAL_OPENAL) option (LUGARU_FORCE_INTERNAL_SDL "Force internal libSDL, even if there's a system version" False) if (NOT LUGARU_FORCE_INTERNAL_SDL) @@ -204,20 +228,24 @@ if (NOT SDL_FOUND) if (WIN32) set(LUGARU_HAS_INTERNAL_SDL True) - if (MSVC) - set(SDLMAIN_LIBRARY - ${SDLDIR}/lib/win32/msvc/SDLmain.lib + if (MSVC80) + set(SDL_LIBRARY + ${SDLDIR}/lib/win32/msvc2005/SDLmain.lib + ${SDLDIR}/lib/win32/msvc2005/SDL.lib ) - set(SDL_LIBRARY_TEMP - ${SDLDIR}/lib/win32/msvc/SDL.lib + endif (MSVC80) + if (MSVC90) + set(SDL_LIBRARY + ${SDLDIR}/lib/win32/msvc2008/SDLmain.lib + ${SDLDIR}/lib/win32/msvc2008/SDL.lib ) - endif (MSVC) + endif (MSVC90) if (MINGW) - set(SDLMAIN_LIBRARY + set(SDL_LIBRARY + "mingw32" ${SDLDIR}/lib/win32/mingw/libSDLmain.a - ) - set(SDL_LIBRARY_TEMP ${SDLDIR}/lib/win32/mingw/libSDL.dll.a + "-mwindows" ) endif (MINGW) endif (WIN32) @@ -456,10 +484,14 @@ endif(WIN32) # Install target if(WIN32) install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/lugaru.exe DESTINATION ${CMAKE_INSTALL_PREFIX}) - if(MSVC) - install(FILES ${SDLDIR}/lib/win32/msvc/SDL.dll DESTINATION ${CMAKE_INSTALL_PREFIX}) - #install(FILES ${OPENALDIR}/lib/win32/msvc/OpenAL32.dll DESTINATION ${CMAKE_INSTALL_PREFIX}) # FIXME: Add MSVC OpenAL library! - endif(MSVC) + if(MSVC80) + install(FILES ${SDLDIR}/lib/win32/msvc2005/SDL.dll DESTINATION ${CMAKE_INSTALL_PREFIX}) + install(FILES ${OPENALDIR}/lib/win32/msvc2005/OpenAL32.dll DESTINATION ${CMAKE_INSTALL_PREFIX}) + endif(MSVC80) + if(MSVC90) + install(FILES ${SDLDIR}/lib/win32/msvc2008/SDL.dll DESTINATION ${CMAKE_INSTALL_PREFIX}) + install(FILES ${OPENALDIR}/lib/win32/msvc2008/OpenAL32.dll DESTINATION ${CMAKE_INSTALL_PREFIX}) + endif(MSVC90) if(MINGW) install(FILES ${SDLDIR}/lib/win32/mingw/SDL.dll DESTINATION ${CMAKE_INSTALL_PREFIX}) install(FILES ${OPENALDIR}/lib/win32/mingw/OpenAL32.dll DESTINATION ${CMAKE_INSTALL_PREFIX})