From cfd0e12dd7d7fdbad2994b5844cf5ee771caf507 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Fri, 15 Apr 2011 01:15:46 +0000 Subject: [PATCH] -fix cmake script for mingw, just for completeness. --- source/configurator/CMakeLists.txt | 2 +- source/g3d_viewer/CMakeLists.txt | 2 +- source/glest_game/CMakeLists.txt | 2 +- source/glest_map_editor/CMakeLists.txt | 4 ++-- source/shared_lib/CMakeLists.txt | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/source/configurator/CMakeLists.txt b/source/configurator/CMakeLists.txt index d42579a8..32ae5d06 100644 --- a/source/configurator/CMakeLists.txt +++ b/source/configurator/CMakeLists.txt @@ -107,7 +107,7 @@ SET_SOURCE_FILES_PROPERTIES(${MG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1) ADD_EXECUTABLE(${TARGET_NAME} ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES}) TARGET_LINK_LIBRARIES(${TARGET_NAME} streflop) IF(WIN32) -TARGET_LINK_LIBRARIES(${TARGET_NAME} megaglest) +TARGET_LINK_LIBRARIES(${TARGET_NAME} libmegaglest) ELSE() TARGET_LINK_LIBRARIES(${TARGET_NAME} libmegaglest) ENDIF() diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt index 998916db..dca2a548 100644 --- a/source/g3d_viewer/CMakeLists.txt +++ b/source/g3d_viewer/CMakeLists.txt @@ -114,7 +114,7 @@ SET_SOURCE_FILES_PROPERTIES(${MG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1) ADD_EXECUTABLE(${TARGET_NAME} ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES}) TARGET_LINK_LIBRARIES(${TARGET_NAME} streflop) IF(WIN32) -TARGET_LINK_LIBRARIES(${TARGET_NAME} megaglest) +TARGET_LINK_LIBRARIES(${TARGET_NAME} libmegaglest) ELSE() TARGET_LINK_LIBRARIES(${TARGET_NAME} libmegaglest) ENDIF() diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt index b95bf6e6..d817b34a 100644 --- a/source/glest_game/CMakeLists.txt +++ b/source/glest_game/CMakeLists.txt @@ -182,7 +182,7 @@ SET_SOURCE_FILES_PROPERTIES(${MG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1) ADD_EXECUTABLE(${TARGET_NAME} ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES}) IF(WIN32) - TARGET_LINK_LIBRARIES(${TARGET_NAME} stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32 advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 SDL SDLmain lua5.1 streflop megaglest stdc++ moldname mingwex msvcrt user32 kernel32) + TARGET_LINK_LIBRARIES(${TARGET_NAME} stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32 advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 SDL SDLmain lua5.1 streflop libmegaglest stdc++ moldname mingwex msvcrt user32 kernel32) ENDIF() IF(NOT WIN32) TARGET_LINK_LIBRARIES(${TARGET_NAME} streflop) diff --git a/source/glest_map_editor/CMakeLists.txt b/source/glest_map_editor/CMakeLists.txt index dd5a3b0e..0aa4a387 100644 --- a/source/glest_map_editor/CMakeLists.txt +++ b/source/glest_map_editor/CMakeLists.txt @@ -110,12 +110,12 @@ SET_SOURCE_FILES_PROPERTIES(${MG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1) ADD_EXECUTABLE(${TARGET_NAME} ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES}) IF(WIN32) - TARGET_LINK_LIBRARIES(${TARGET_NAME} stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32 advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 SDL SDLmain lua5.1 streflop megaglest stdc++ moldname mingwex msvcrt user32 kernel32) + TARGET_LINK_LIBRARIES(${TARGET_NAME} stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32 advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 SDL SDLmain lua5.1 streflop libmegaglest stdc++ moldname mingwex msvcrt user32 kernel32) ENDIF() TARGET_LINK_LIBRARIES(${TARGET_NAME} streflop) IF(WIN32) -TARGET_LINK_LIBRARIES(${TARGET_NAME} megaglest) +TARGET_LINK_LIBRARIES(${TARGET_NAME} libmegaglest) ELSE() TARGET_LINK_LIBRARIES(${TARGET_NAME} libmegaglest) ENDIF() diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt index a19f5066..d6cfd57d 100644 --- a/source/shared_lib/CMakeLists.txt +++ b/source/shared_lib/CMakeLists.txt @@ -238,17 +238,17 @@ IF(NOT WIN32) MESSAGE(STATUS "Building shared game library as a STATIC library and saving to [${LIBRARY_OUTPUT_PATH}]") ELSE() SET(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/data/glest_game) - ADD_LIBRARY(megaglest STATIC ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES}) + ADD_LIBRARY(libmegaglest STATIC ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES}) MESSAGE(STATUS "Building shared game library as a SHARED library and saving to [${LIBRARY_OUTPUT_PATH}]") ENDIF() #ADD_LIBRARY(libmegaglest SHARED ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES}) #ADD_LIBRARY(libmegaglest STATIC ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES}) IF(WIN32) - TARGET_LINK_LIBRARIES(megaglest stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32 advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 SDL SDLmain lua5.1 streflop stdc++ moldname mingwex msvcrt user32 kernel32) + TARGET_LINK_LIBRARIES(libmegaglest stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32 advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 SDL SDLmain lua5.1 streflop stdc++ moldname mingwex msvcrt user32 kernel32) - TARGET_LINK_LIBRARIES(megaglest streflop) - TARGET_LINK_LIBRARIES(megaglest ${EXTERNAL_LIBS}) + TARGET_LINK_LIBRARIES(libmegaglest streflop) + TARGET_LINK_LIBRARIES(libmegaglest ${EXTERNAL_LIBS}) ELSE()