Changeset 220
- Timestamp:
- Jan 17, 2011, 9:25:16 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 4 added
- 5 edited
- 1 copied
- 7 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/.gitignore
r161 r220 31 31 *~ 32 32 # Our binaries 33 src/test-map 34 src/editor 33 deushax/deushax 34 deushax/editor 35 monsterz/monsterz 35 36 tools/make-font 36 37 # Our data -
trunk/Makefile.am
r148 r220 1 1 2 SUBDIRS = src tools art gfx2 SUBDIRS = src deushax monsterz tools art gfx 3 3 DIST_SUBDIRS = $(SUBDIRS) maps 4 4 -
trunk/configure.ac
r178 r220 87 87 88 88 89 # How to use the Lol Engine inside this tree 90 LOL_CFLAGS="-I \$(top_srcdir)/src `pkg-config --cflags sdl gl SDL_image`" 91 LOL_LIBS="`pkg-config --libs sdl gl SDL_image`" 92 89 93 if test "${enable_release}" = "yes"; then 90 94 AC_DEFINE(FINAL_RELEASE, 1, Define to 1 to activate final release) … … 92 96 93 97 AC_SUBST(MATH_LIBS) 98 AC_SUBST(LOL_CFLAGS) 99 AC_SUBST(LOL_LIBS) 94 100 95 101 AC_CONFIG_FILES([ 96 102 Makefile 97 103 src/Makefile 104 monsterz/Makefile 105 deushax/Makefile 98 106 tools/Makefile 99 107 art/Makefile -
trunk/deushax/gtk/glmapview.h
r219 r220 6 6 #if !defined __DH_GLMAPVIEW_H__ 7 7 #define __DH_GLMAPVIEW_H__ 8 9 #include "mapviewer.h" 8 10 9 11 #include <gtk/gtk.h> -
trunk/deushax/mapviewer.cpp
r219 r220 11 11 12 12 #include "core.h" 13 #include "mapviewer.h" 13 14 14 15 /* -
trunk/src/Makefile.am
r218 r220 1 1 2 noinst_ PROGRAMS = test-map editor2 noinst_LIBRARIES = liblol.a 3 3 4 noinst_LIBRARIES = libcommon.a 5 6 libcommon_a_SOURCES = \ 4 liblol_a_SOURCES = \ 7 5 core.h matrix.h game.cpp game.h tiler.cpp tiler.h dict.cpp dict.h \ 8 6 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 \ 11 9 profiler.cpp profiler.h input.h input.cpp world.cpp world.h \ 10 \ 11 sdlinput.cpp sdlinput.h \ 12 \ 12 13 debugfps.cpp debugfps.h debugsprite.cpp debugsprite.h \ 13 14 debugrecord.cpp debugrecord.h debugstats.cpp debugstats.h \ 14 15 debugsphere.cpp debugsphere.h debugboard.cpp debugboard.h 15 lib common_a_CXXFLAGS = `pkg-config --cflags sdl gl SDL_image`16 liblol_a_CXXFLAGS = `pkg-config --cflags sdl gl SDL_image` 16 17 17 test_map_SOURCES = test-map.cpp sdlinput.cpp sdlinput.h18 test_map_CXXFLAGS = `pkg-config --cflags sdl gl SDL_image` @PIPI_CFLAGS@19 test_map_LDADD = libcommon.a20 test_map_LDFLAGS = `pkg-config --libs sdl gl SDL_image` @PIPI_LIBS@21 22 editor_SOURCES = gtk/editor.cpp gtk/glmapview.cpp gtk/glmapview.h \23 mapviewer.cpp mapviewer.h24 editor_CXXFLAGS = `pkg-config --cflags sdl gl SDL_image gtk+-2.0 gtkgl-2.0`25 editor_LDADD = libcommon.a26 editor_LDFLAGS = `pkg-config --libs sdl gl gtk+-2.0 gtkgl-2.0 SDL_image`27 EXTRA_DIST = gtk/editor.xml28 -
trunk/src/core.h
r183 r220 27 27 #include "game.h" 28 28 #include "tileset.h" 29 #include "mapviewer.h"30 29 #include "world.h" 31 30
Note: See TracChangeset
for help on using the changeset viewer.