Changeset 220


Ignore:
Timestamp:
Jan 17, 2011, 9:25:16 PM (10 years ago)
Author:
sam
Message:

Split test-map into deus-hax and monsterz.

Location:
trunk
Files:
4 added
5 edited
1 copied
7 moved

Legend:

Unmodified
Added
Removed
  • trunk/.gitignore

    r161 r220  
    3131*~
    3232# Our binaries
    33 src/test-map
    34 src/editor
     33deushax/deushax
     34deushax/editor
     35monsterz/monsterz
    3536tools/make-font
    3637# Our data
  • trunk/Makefile.am

    r148 r220  
    11
    2 SUBDIRS = src tools art gfx
     2SUBDIRS = src deushax monsterz tools art gfx
    33DIST_SUBDIRS = $(SUBDIRS) maps
    44
  • trunk/configure.ac

    r178 r220  
    8787
    8888
     89# How to use the Lol Engine inside this tree
     90LOL_CFLAGS="-I \$(top_srcdir)/src `pkg-config --cflags sdl gl SDL_image`"
     91LOL_LIBS="`pkg-config --libs sdl gl SDL_image`"
     92
    8993if test "${enable_release}" = "yes"; then
    9094  AC_DEFINE(FINAL_RELEASE, 1, Define to 1 to activate final release)
     
    9296
    9397AC_SUBST(MATH_LIBS)
     98AC_SUBST(LOL_CFLAGS)
     99AC_SUBST(LOL_LIBS)
    94100
    95101AC_CONFIG_FILES([
    96102  Makefile
    97103  src/Makefile
     104  monsterz/Makefile
     105  deushax/Makefile
    98106  tools/Makefile
    99107  art/Makefile
  • trunk/deushax/gtk/glmapview.h

    r219 r220  
    66#if !defined __DH_GLMAPVIEW_H__
    77#define __DH_GLMAPVIEW_H__
     8
     9#include "mapviewer.h"
    810
    911#include <gtk/gtk.h>
  • trunk/deushax/mapviewer.cpp

    r219 r220  
    1111
    1212#include "core.h"
     13#include "mapviewer.h"
    1314
    1415/*
  • trunk/src/Makefile.am

    r218 r220  
    11
    2 noinst_PROGRAMS = test-map editor
     2noinst_LIBRARIES = liblol.a
    33
    4 noinst_LIBRARIES = libcommon.a
    5 
    6 libcommon_a_SOURCES = \
     4liblol_a_SOURCES = \
    75    core.h matrix.h game.cpp game.h tiler.cpp tiler.h dict.cpp dict.h \
    86    scene.cpp scene.h font.cpp font.h layer.cpp layer.h map.cpp map.h \
     
    108    forge.cpp forge.h video.cpp video.h timer.cpp timer.h bitfield.h \
    119    profiler.cpp profiler.h input.h input.cpp world.cpp world.h \
     10    \
     11    sdlinput.cpp sdlinput.h \
     12    \
    1213    debugfps.cpp debugfps.h debugsprite.cpp debugsprite.h \
    1314    debugrecord.cpp debugrecord.h debugstats.cpp debugstats.h \
    1415    debugsphere.cpp debugsphere.h debugboard.cpp debugboard.h
    15 libcommon_a_CXXFLAGS = `pkg-config --cflags sdl gl SDL_image`
     16liblol_a_CXXFLAGS = `pkg-config --cflags sdl gl SDL_image`
    1617
    17 test_map_SOURCES = test-map.cpp sdlinput.cpp sdlinput.h
    18 test_map_CXXFLAGS = `pkg-config --cflags sdl gl SDL_image` @PIPI_CFLAGS@
    19 test_map_LDADD = libcommon.a
    20 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.h
    24 editor_CXXFLAGS = `pkg-config --cflags sdl gl SDL_image gtk+-2.0 gtkgl-2.0`
    25 editor_LDADD = libcommon.a
    26 editor_LDFLAGS = `pkg-config --libs sdl gl gtk+-2.0 gtkgl-2.0 SDL_image`
    27 EXTRA_DIST = gtk/editor.xml
    28 
  • trunk/src/core.h

    r183 r220  
    2727#include "game.h"
    2828#include "tileset.h"
    29 #include "mapviewer.h"
    3029#include "world.h"
    3130
Note: See TracChangeset for help on using the changeset viewer.