r1459 - in packages/trunk/glest: . debian debian/patches mk mk/linux

[Eddy Petrisor]

Author: eddyp-guest
Date: 2006-08-31 21:21:12 +0000 (Thu, 31 Aug 2006)
New Revision: 1459

Added:
   packages/trunk/glest/mk/
   packages/trunk/glest/mk/linux/
   packages/trunk/glest/mk/linux/Jamfile
Modified:
   packages/trunk/glest/debian/changelog
   packages/trunk/glest/debian/patches/00list
Log:
make the clean rule always present in the Jamfile

Modified: packages/trunk/glest/debian/changelog
===================================================================
--- packages/trunk/glest/debian/changelog	2006-08-30 23:03:05 UTC (rev 1458)
+++ packages/trunk/glest/debian/changelog	2006-08-31 21:21:12 UTC (rev 1459)
@@ -8,8 +8,9 @@
   * added myself to uploaders
   * Debian Games Team is maintainer
   * Added a Homepage semi-field
-  * added a clean rule to the upstream Jamfile
+  * added a clean rule to the upstream Jamfile (not as a patch since it
+    brings in unnecessary complications and the rule should be always there)
   * modified the way the editor building is disabled
 
- -- Eddy Petrișor <eddy.petrisor at gmail.com>  Tue, 29 Aug 2006 17:18:16 +0300
+ -- Eddy Petrișor <eddy.petrisor at gmail.com>  Fri,  1 Sep 2006 00:12:02 +0300
 

Modified: packages/trunk/glest/debian/patches/00list
===================================================================
--- packages/trunk/glest/debian/patches/00list	2006-08-30 23:03:05 UTC (rev 1458)
+++ packages/trunk/glest/debian/patches/00list	2006-08-31 21:21:12 UTC (rev 1459)
@@ -1,3 +1,2 @@
-01_addcleanrule.dpatch
 05_nomapeditor.dpatch
 10_fix_gcc-4.1_particle.h.dpatch

Added: packages/trunk/glest/mk/linux/Jamfile
===================================================================
--- packages/trunk/glest/mk/linux/Jamfile	                        (rev 0)
+++ packages/trunk/glest/mk/linux/Jamfile	2006-08-31 21:21:12 UTC (rev 1459)
@@ -0,0 +1,63 @@
+SubDir TOP ;
+
+UseAutoconf ;
+
+Package license.txt readme.txt ;
+
+#### Library ####
+SubDir TOP shared_lib sources ;
+
+LIB_DIRS = platform/sdl util graphics graphics/gl sound sound/openal xml glew ;
+LIB_INCLUDE_DIRS = ../include/$(LIB_DIRS) ;
+
+for i in $(LIB_DIRS) {
+  LIB_SOURCES += [ Wildcard $(i) : *.c *.cpp *.h ] ;
+}
+
+Library glestlib : $(LIB_SOURCES) ;
+ExternalLibs glestlib : SDL GL GLU XERCES VORBIS VORBISFILE OGG OPENAL ;
+IncludeDir glestlib : $(LIB_INCLUDE_DIRS) ;
+
+#### Game ####
+SubDir TOP glest_game ;
+
+GLEST_DIRS = . ai facilities game global graphics gui main menu sound
+             type_instances types world ;
+for i in $(GLEST_DIRS) {
+  GLEST_SOURCES += [ Wildcard $(i) : *.cpp *.h ] ;
+}
+
+Application glest : $(GLEST_SOURCES) ;
+LinkWith glest : glestlib ;
+ExternalLibs glest : SDL GL GLU XERCES VORBIS VORBISFILE OGG OPENAL ;
+IncludeDir glest : ../shared_lib/include/$(LIB_INCLUDE_DIRS) $(GLEST_DIRS) ;
+
+#### Editor ####
+if $(WX_AVAILABLE) = "yes" {
+  SubDir TOP glest_map_editor ;
+
+  GLEST_MAP_DIRS = . ;
+  for i in $(GLEST_DIRS) {
+    GLEST_MAP_SOURCES += [ Wildcard $(i) : *.cpp *.h ] ;
+  }
+
+  Application glest_map_editor : $(GLEST_MAP_SOURCES) ;
+  LinkWith glest_map_editor : glestlib ;
+  ExternalLibs glest_map_editor : SDL GL GLU XERCES VORBIS VORBISFILE OGG OPENAL WX ;
+  IncludeDir glest_map_editor : ../shared_lib/include/$(LIB_INCLUDE_DIRS) $(GLEST_MAP_DIRS) ;
+}
+
+
+#### Clean ####
+
+
+for i in $(LIB_DIRS) {
+   OBJS += [ Wildcard $(i) : *.o *.so ] ;
+}
+
+for i in $(GLEST_DIRS) {
+  OBJS += [ Wildcard $(i) : *.o ] ;
+}
+
+Clean clean : $(OBJS) glest glest_map_editor glestlib ;
+