Changeset 220Tweet

Timestamp:

Jan 17, 2011, 9:25:16 PM (12 years ago)

Author:

sam

Message:

Split test-map into deus-hax and monsterz.

Location:

trunk

Files:

• .gitignore (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• deushax (added)
• deushax/Makefile.am (added)
• deushax/deushax.cpp (copied) (copied from trunk/src/test-map.cpp)
• deushax/gtk (added)
• deushax/gtk/editor.cpp (moved) (moved from trunk/src/gtk/editor.cpp)
• deushax/gtk/editor.xml (moved) (moved from trunk/src/gtk/editor.xml)
• deushax/gtk/glmapview.cpp (moved) (moved from trunk/src/gtk/glmapview.cpp)
• deushax/gtk/glmapview.h (moved) (moved from trunk/src/gtk/glmapview.h) (1 diff)
• deushax/mapviewer.cpp (moved) (moved from trunk/src/mapviewer.cpp) (1 diff)
• deushax/mapviewer.h (moved) (moved from trunk/src/mapviewer.h)
• monsterz/Makefile.am (added)
• monsterz/monsterz.cpp (moved) (moved from trunk/src/test-map.cpp)
• src/Makefile.am (modified) (2 diffs)
• src/core.h (modified) (1 diff)

trunk/.gitignore

@@ -31 +31 @@
 *~
 # Our binaries
-src/test-map
-src/editor
+deushax/deushax
+deushax/editor
+monsterz/monsterz
 tools/make-font
 # Our data

trunk/Makefile.am

@@ -1 +1 @@
 
-SUBDIRS = src tools art gfx
+SUBDIRS = src deushax monsterz tools art gfx
 DIST_SUBDIRS = $(SUBDIRS) maps
 

trunk/configure.ac

@@ -87 +87 @@
 
 
+# How to use the Lol Engine inside this tree
+LOL_CFLAGS="-I \$(top_srcdir)/src `pkg-config --cflags sdl gl SDL_image`"
+LOL_LIBS="`pkg-config --libs sdl gl SDL_image`"
+
 if test "${enable_release}" = "yes"; then
   AC_DEFINE(FINAL_RELEASE, 1, Define to 1 to activate final release)
@@ -92 +96 @@
 
 AC_SUBST(MATH_LIBS)
+AC_SUBST(LOL_CFLAGS)
+AC_SUBST(LOL_LIBS)
 
 AC_CONFIG_FILES([
   Makefile
   src/Makefile
+  monsterz/Makefile
+  deushax/Makefile
   tools/Makefile
   art/Makefile

trunk/deushax/gtk/glmapview.h

@@ -6 +6 @@
 #if !defined __DH_GLMAPVIEW_H__
 #define __DH_GLMAPVIEW_H__
+
+#include "mapviewer.h"
 
 #include <gtk/gtk.h>

trunk/deushax/mapviewer.cpp

@@ -11 +11 @@
 
 #include "core.h"
+#include "mapviewer.h"
 
 /*

trunk/src/Makefile.am

@@ -1 +1 @@
 
-noinst_PROGRAMS = test-map editor
+noinst_LIBRARIES = liblol.a
 
-noinst_LIBRARIES = libcommon.a
-
-libcommon_a_SOURCES = \
+liblol_a_SOURCES = \
     core.h matrix.h game.cpp game.h tiler.cpp tiler.h dict.cpp dict.h \
     scene.cpp scene.h font.cpp font.h layer.cpp layer.h map.cpp map.h \
@@ -10 +8 @@
     forge.cpp forge.h video.cpp video.h timer.cpp timer.h bitfield.h \
     profiler.cpp profiler.h input.h input.cpp world.cpp world.h \
+    \
+    sdlinput.cpp sdlinput.h \
+    \
     debugfps.cpp debugfps.h debugsprite.cpp debugsprite.h \
     debugrecord.cpp debugrecord.h debugstats.cpp debugstats.h \
     debugsphere.cpp debugsphere.h debugboard.cpp debugboard.h
-libcommon_a_CXXFLAGS = `pkg-config --cflags sdl gl SDL_image`
+liblol_a_CXXFLAGS = `pkg-config --cflags sdl gl SDL_image`
 
-test_map_SOURCES = test-map.cpp sdlinput.cpp sdlinput.h
-test_map_CXXFLAGS = `pkg-config --cflags sdl gl SDL_image` @PIPI_CFLAGS@
-test_map_LDADD = libcommon.a
-test_map_LDFLAGS = `pkg-config --libs sdl gl SDL_image` @PIPI_LIBS@
-
-editor_SOURCES = gtk/editor.cpp gtk/glmapview.cpp gtk/glmapview.h \
-                 mapviewer.cpp mapviewer.h
-editor_CXXFLAGS = `pkg-config --cflags sdl gl SDL_image gtk+-2.0 gtkgl-2.0`
-editor_LDADD = libcommon.a
-editor_LDFLAGS = `pkg-config --libs sdl gl gtk+-2.0 gtkgl-2.0 SDL_image`
-EXTRA_DIST = gtk/editor.xml
-

trunk/src/core.h

@@ -27 +27 @@
 #include "game.h"
 #include "tileset.h"
-#include "mapviewer.h"
 #include "world.h"