Changeset 3493 in orxonox.OLD for orxonox/trunk/src
- Timestamp:
- Mar 11, 2005, 9:48:35 AM (20 years ago)
- Location:
- orxonox/trunk/src
- Files:
-
- 6 added
- 7 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/src/Makefile.am
r3491 r3493 64 64 game_loader.h \ 65 65 track_manager.h \ 66 glincl.h \67 66 ability.h \ 68 67 camera.h \ … … 87 86 network/synchronisable.h \ 88 87 defs/stdincl.h \ 88 defs/glincl.h \ 89 89 defs/error.h \ 90 90 defs/debug.h \ … … 108 108 EXTRA_DIST = orxonox.conf 109 109 110 ### GTK_RELATED111 if HAVE_GTK2112 GTK_PROGS =console113 else114 GTK_PROGS =115 endif116 110 if SUB_PROJECTS 117 SUB_PROGS = gui 118 # $(GTK_PROGS) 119 ##lib/graphics/importer \ 111 SUB_PROGS = lib 120 112 else 121 113 SUB_PROGS = -
orxonox/trunk/src/Makefile.in
r3491 r3493 106 106 ETAGS = etags 107 107 CTAGS = ctags 108 DIST_SUBDIRS = . gui108 DIST_SUBDIRS = . lib 109 109 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 110 110 ACLOCAL = @ACLOCAL@ … … 254 254 game_loader.h \ 255 255 track_manager.h \ 256 glincl.h \257 256 ability.h \ 258 257 camera.h \ … … 277 276 network/synchronisable.h \ 278 277 defs/stdincl.h \ 278 defs/glincl.h \ 279 279 defs/error.h \ 280 280 defs/debug.h \ … … 295 295 296 296 EXTRA_DIST = orxonox.conf 297 @HAVE_GTK2_FALSE@GTK_PROGS =298 299 ### GTK_RELATED300 @HAVE_GTK2_TRUE@GTK_PROGS = console301 # $(GTK_PROGS)302 297 @SUB_PROJECTS_FALSE@SUB_PROGS = 303 @SUB_PROJECTS_TRUE@SUB_PROGS = gui298 @SUB_PROJECTS_TRUE@SUB_PROGS = lib 304 299 SUBDIRS = . \ 305 300 $(SUB_PROGS) … … 318 313 esac; \ 319 314 done; \ 320 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/Makefile'; \315 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ 321 316 cd $(top_srcdir) && \ 322 $(AUTOMAKE) -- foreignsrc/Makefile317 $(AUTOMAKE) --gnu src/Makefile 323 318 .PRECIOUS: Makefile 324 319 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/lib/graphics/importer/Makefile.in
r3487 r3493 215 215 esac; \ 216 216 done; \ 217 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/graphics/importer/Makefile'; \217 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/graphics/importer/Makefile'; \ 218 218 cd $(top_srcdir) && \ 219 $(AUTOMAKE) -- foreignsrc/lib/graphics/importer/Makefile219 $(AUTOMAKE) --gnu src/lib/graphics/importer/Makefile 220 220 .PRECIOUS: Makefile 221 221 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/lib/gui/console/Makefile.in
r3489 r3493 203 203 esac; \ 204 204 done; \ 205 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/gui/console/Makefile'; \205 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/gui/console/Makefile'; \ 206 206 cd $(top_srcdir) && \ 207 $(AUTOMAKE) -- foreignsrc/lib/gui/console/Makefile207 $(AUTOMAKE) --gnu src/lib/gui/console/Makefile 208 208 .PRECIOUS: Makefile 209 209 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/lib/gui/gui/Makefile.am
r3423 r3493 1 MAINSRCDIR=../../.. 1 2 AM_CXXFLAGS=$(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS) 3 AM_CXXFLAGS+=-I$(MAINSRCDIR) 4 AM_CXXFLAGS+=-I$(MAINSRCDIR)/world_entities 5 AM_CXXFLAGS+=-I$(MAINSRCDIR)/story_entities 6 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib 7 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/coord 8 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/data 9 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gaphics 10 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/font 11 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer 12 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui 13 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/lang 14 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util 15 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/math 16 AM_CXXFLAGS+=-I$(MAINSRCDIR)/defs 17 AM_CXXFLAGS+=-I$(MAINSRCDIR)/font 18 AM_CXXFLAGS+=-I$(MAINSRCDIR)/network 19 AM_CXXFLAGS+=-I$(MAINSRCDIR)/glmenu 20 AM_CXXFLAGS+=-I$(MAINSRCDIR)/ai 21 2 22 #AM_LDFLAGS=$(GTK2_LIBS) $(GTHREAD_LIBS) 3 23 LIBS=$(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) -
orxonox/trunk/src/lib/gui/gui/Makefile.in
r3484 r3493 24 24 pkglibdir = $(libdir)/@PACKAGE@ 25 25 pkgincludedir = $(includedir)/@PACKAGE@ 26 top_builddir = ../.. 26 top_builddir = ../../../.. 27 27 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd 28 28 INSTALL = @INSTALL@ … … 40 40 host_triplet = @host@ 41 41 bin_PROGRAMS = gui$(EXEEXT) 42 subdir = src/ gui42 subdir = src/lib/gui/gui 43 43 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ 44 44 $(srcdir)/Makefile.in … … 129 129 LDFLAGS = @LDFLAGS@ 130 130 LIBOBJS = @LIBOBJS@ 131 131 132 #AM_LDFLAGS=$(GTK2_LIBS) $(GTHREAD_LIBS) 132 133 LIBS = $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) … … 190 191 target_os = @target_os@ 191 192 target_vendor = @target_vendor@ 192 AM_CXXFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS) 193 MAINSRCDIR = ../../.. 194 AM_CXXFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS) -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/gaphics -I$(MAINSRCDIR)/lib/graphics/font -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai 193 195 gui_SOURCES = orxonox_gui.cc \ 194 196 orxonox_gui_gtk.cc \ … … 234 236 esac; \ 235 237 done; \ 236 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreign src/gui/Makefile'; \238 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/gui/gui/Makefile'; \ 237 239 cd $(top_srcdir) && \ 238 $(AUTOMAKE) -- foreign src/gui/Makefile240 $(AUTOMAKE) --gnu src/lib/gui/gui/Makefile 239 241 .PRECIOUS: Makefile 240 242 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/lib/gui/gui/orxonox_gui_gtk.h
r3423 r3493 13 13 extern int verbose; // soon obsolete here 14 14 15 #include " ../debug.h"15 #include "debug.h" 16 16 17 17 #ifdef HAVE_GTK2
Note: See TracChangeset
for help on using the changeset viewer.