Author: mordante
Date: Thu Jun 12 17:02:22 2008
New Revision: 27121
URL: http://svn.gna.org/viewcvs/wesnoth?rev=27121&view=rev
Log:
Add the autotools changes to enable ilor's new editor.
Commit based on ilor's patch.
Modified:
trunk/configure.ac
trunk/src/Makefile.am
Modified: trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/configure.ac?rev=27121&r1=27120&r2=27121&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Jun 12 17:02:22 2008
@@ -239,6 +239,11 @@
[editor=$enableval],
[editor=no])
+AC_ARG_WITH([editor2],
+ AS_HELP_STRING([--enable-editor2], [build the new map editor in
the game]),
+ [editor2=$withval],
+ [editor2=""])
+
AC_ARG_ENABLE([tools],
AS_HELP_STRING([--enable-tools], [enable building and
installation of tools for artists and WML maintainers]),
[tools=$enableval],
@@ -296,11 +301,17 @@
AM_CONDITIONAL([CAMPAIGNSERVER], [test x$campaignserver = xyes])
AM_CONDITIONAL([TESTS], [test x$tests = xyes])
AM_CONDITIONAL([EDITOR], [test x$editor = xyes])
+AM_CONDITIONAL([EDITOR2], [test x$editor2 = xyes])
AM_CONDITIONAL([TOOLS], [test x$tools = xyes])
AM_CONDITIONAL([GCC], [test x$GXX = xyes])
AM_CONDITIONAL([INCLUDEDINTL], [test x$nls_cv_use_gnu_gettext = xyes])
AM_CONDITIONAL([INSTALLDATA], [test x$game = xyes || x$editor = xyes])
AM_CONDITIONAL([DUMMYLOCALES], [test x$dummylocales = xyes])
+
+if test "x$editor2" = "xyes"
+then
+ CXXFLAGS="$CXXFLAGS -DUSE_EDITOR2"
+fi
if test x$dummylocales = xyes; then
AC_DEFINE([USE_DUMMYLOCALES],,[Define if the game should not use system
locales])
Modified: trunk/src/Makefile.am
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/Makefile.am?rev=27121&r1=27120&r2=27121&view=diff
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Thu Jun 12 17:02:22 2008
@@ -135,6 +135,22 @@
variant.cpp \
widgets/combo.cpp \
widgets/scrollpane.cpp
+
+# used with editor2 option in the wesnoth target
+wesnoth_editor2_SOURCES = \
+ 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
+
+if EDITOR2
+wesnoth_source += $(wesnoth_editor2_SOURCES)
+endif
+
#############################################################################
# Wesnoth #
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
