Author: ivanovic
Date: Wed Jun 18 21:06:09 2008
New Revision: 27296
URL: http://svn.gna.org/viewcvs/wesnoth?rev=27296&view=rev
Log:
add building of EDITOR2 to cmake recipe
Modified:
trunk/CMakeLists.txt
trunk/src/CMakeLists.txt
Modified: trunk/CMakeLists.txt
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/CMakeLists.txt?rev=27296&r1=27295&r2=27296&view=diff
==============================================================================
--- trunk/CMakeLists.txt (original)
+++ trunk/CMakeLists.txt Wed Jun 18 21:06:09 2008
@@ -59,6 +59,7 @@
option(ENABLE_CAMPAIGN_SERVER "Enable compilation of campaign server")
option(ENABLE_SERVER "Enable compilation of server" ON)
option(ENABLE_EDITOR "Enable compilation of map editor")
+option(ENABLE_EDITOR2 "Enable compilation of the new map editor into the game")
option(ENABLE_TOOLS "Enable building and installation of tools for artists and
WML maintainers")
option(ENABLE_TESTS "Build unit tests")
option(ENABLE_NLS "Enable building of tranlations" ON)
Modified: trunk/src/CMakeLists.txt
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/CMakeLists.txt?rev=27296&r1=27295&r2=27296&view=diff
==============================================================================
--- trunk/src/CMakeLists.txt (original)
+++ trunk/src/CMakeLists.txt Wed Jun 18 21:06:09 2008
@@ -283,10 +283,34 @@
widgets/scrollpane.cpp
)
+# used with editor2 option in the wesnoth target
+IF(ENABLE_EDITOR2)
+
+SET(wesnoth-editor2_SRC
+ editor2/editor_main.cpp
+ editor/editor.cpp
+ editor/editor_layout.cpp
+ editor/map_manip.cpp
+ editor/editor_display.cpp
+ editor/editor_palettes.cpp
+ editor/editor_dialogs.cpp
+ editor/editor_undo.cpp
+)
+
SET(wesnoth_SRC
game.cpp
${wesnoth-main_SRC}
-)
+ ${wesnoth-editor2_SRC}
+)
+
+ELSE(ENABLE_EDITOR2)
+
+SET(wesnoth_SRC
+ game.cpp
+ ${wesnoth-main_SRC}
+)
+
+ENDIF(ENABLE_EDITOR2)
add_executable(wesnoth ${wesnoth_SRC})
target_link_libraries(wesnoth wesnoth-core wesnoth-game ${game-external-libs})
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
