From: <lyn...@us...> - 2008-05-16 20:12:04
|
Revision: 5151 http://gemrb.svn.sourceforge.net/gemrb/?rev=5151&view=rev Author: lynxlupodian Date: 2008-05-16 13:12:00 -0700 (Fri, 16 May 2008) Log Message: ----------- fixes to the cmake build system for better unix compatibility: case sensitivity and a missing parameter; converted the Core list to globbing Modified Paths: -------------- gemrb/trunk/gemrb/plugins/CMakeLists.txt gemrb/trunk/gemrb/plugins/Core/CMakeLists.txt gemrb/trunk/gemrb/plugins/KEYImporter/CMakeLists.txt gemrb/trunk/gemrb/plugins/ZLibMgr/CMakeLists.txt Modified: gemrb/trunk/gemrb/plugins/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/CMakeLists.txt 2008-05-14 16:36:17 UTC (rev 5150) +++ gemrb/trunk/gemrb/plugins/CMakeLists.txt 2008-05-16 20:12:00 UTC (rev 5151) @@ -32,5 +32,5 @@ ADD_SUBDIRECTORY( TLKImporter ) ADD_SUBDIRECTORY( WEDImporter ) ADD_SUBDIRECTORY( WMPImporter ) -ADD_SUBDIRECTORY( ZlibMgr ) +ADD_SUBDIRECTORY( ZLibMgr ) ADD_SUBDIRECTORY( OpenALAudio ) Modified: gemrb/trunk/gemrb/plugins/Core/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/Core/CMakeLists.txt 2008-05-14 16:36:17 UTC (rev 5150) +++ gemrb/trunk/gemrb/plugins/Core/CMakeLists.txt 2008-05-16 20:12:00 UTC (rev 5151) @@ -2,111 +2,9 @@ ADD_DEFINITIONS(-DGEM_BUILD_DLL) ENDIF(WIN32) -SET(gemrb_core_LIB_SRCS - Actions.cpp - Audio.cpp - Console.cpp - DataFileMgr.cpp - EventMgr.cpp - Game.cpp - GameControl.cpp - GameScript.cpp - GSUtils.cpp - GlobalTimer.cpp - MusicMgr.cpp - Polygon.cpp - Progressbar.cpp - SaveGameIterator.cpp - ScriptEngine.cpp - ScriptedAnimation.cpp - ScrollBar.cpp - SoundMgr.cpp - TableMgr.cpp - TextEdit.cpp - Triggers.cpp - Variables.cpp - TextArea.cpp - Slider.cpp - Label.cpp - WindowMgr.cpp - Window.cpp - VideoModes.cpp - VideoMode.cpp - Video.cpp - VFS.cpp - TileSetMgr.cpp - TileOverlay.cpp - TileMapMgr.cpp - TileMap.cpp - Tile.cpp - WorldMap.cpp - WorldMapMgr.cpp - SymbolMgr.cpp - StringMgr.cpp - Sprite2D.cpp - ResourceMgr.cpp - Region.cpp - PluginMgr.cpp - Plugin.cpp - MoviePlayer.cpp - MemoryStream.cpp - MapMgr.cpp - Map.cpp - InterfaceDesc.cpp - Interface.cpp - ImageMgr.cpp - ImageFactory.cpp - Font.cpp - FileStream.cpp - FactoryObject.cpp - Factory.cpp - DataStream.cpp - Core.cpp - Control.cpp - Compressor.cpp - Class_ID.cpp - ClassDesc.cpp - CharAnimations.cpp - CachedFileStream.cpp - Button.cpp - ArchiveImporter.cpp - AnimationMgr.cpp - AnimationFactory.cpp - Animation.cpp - ActorMgr.cpp - Actor.cpp - ActorBlock.cpp - SaveGameMgr.cpp - DialogMgr.cpp - Dialog.cpp - SpellMgr.cpp - Spell.cpp - ItemMgr.cpp - Item.cpp - StoreMgr.cpp - Store.cpp - Inventory.cpp - Spellbook.cpp - Ambient.cpp - WorldMapControl.cpp - MapControl.cpp - AmbientMgr.cpp - EffectQueue.cpp - Cache.cpp - ControlAnimation.cpp - EffectMgr.cpp - OpcodeMgr.cpp - SpriteCover.cpp - PCStatStruct.cpp - Palette.cpp - ProjectileMgr.cpp - Projectile.cpp - ProjectileServer.cpp - Particles.cpp - IniSpawn.cpp - LRUCache.cpp - ) +FILE(GLOB gemrb_core_LIB_SRCS "*.cpp") ADD_LIBRARY(gemrb_core SHARED ${gemrb_core_LIB_SRCS} ) -INSTALL( TARGETS gemrb_core RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX} ) +INSTALL( TARGETS gemrb_core RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX} + LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib ) Modified: gemrb/trunk/gemrb/plugins/KEYImporter/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/KEYImporter/CMakeLists.txt 2008-05-14 16:36:17 UTC (rev 5150) +++ gemrb/trunk/gemrb/plugins/KEYImporter/CMakeLists.txt 2008-05-16 20:12:00 UTC (rev 5151) @@ -1,4 +1,4 @@ -ADD_LIBRARY(KEYImporter MODULE KEYImp.cpp KEYImpCD.cpp KEYImporter.cpp Dictionary.cpp) +ADD_LIBRARY(KEYImporter MODULE KeyImp.cpp KEYImpCD.cpp KEYImporter.cpp Dictionary.cpp) TARGET_LINK_LIBRARIES( KEYImporter gemrb_core ) -INSTALL( TARGETS KEYImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL( TARGETS KEYImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/ZLibMgr/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/ZLibMgr/CMakeLists.txt 2008-05-14 16:36:17 UTC (rev 5150) +++ gemrb/trunk/gemrb/plugins/ZLibMgr/CMakeLists.txt 2008-05-16 20:12:00 UTC (rev 5151) @@ -1,4 +1,4 @@ -ADD_LIBRARY(ZlibMgr MODULE ZlibManager.cpp ZlibMgr.cpp ZlibMgrDesc.cpp ) -TARGET_LINK_LIBRARIES( ZlibMgr gemrb_core ${ZLIB_LIBRARY} ) +ADD_LIBRARY(ZLibMgr MODULE ZLibManager.cpp ZLibMgr.cpp ZLibMgrDesc.cpp ) +TARGET_LINK_LIBRARIES( ZLibMgr gemrb_core ${ZLIB_LIBRARY} ) -INSTALL(TARGETS ZlibMgr DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL(TARGETS ZLibMgr DESTINATION ${PLUGIN_INSTALL_DIR} ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |