Changeset 4265 in orxonox.OLD for orxonox/trunk/src/lib
- Timestamp:
- May 22, 2005, 7:49:02 PM (20 years ago)
-
orxonox/trunk: tinyxml too
- Location:
- orxonox/trunk/src/lib
- Files:
-
- 1 added
- 8 edited
- 1 copied
-
Makefile.am (modified) (1 diff)
-
Makefile.in (modified) (4 diffs)
-
graphics/Makefile.in (modified) (1 diff)
-
graphics/importer/Makefile.in (modified) (1 diff)
-
gui/Makefile.in (modified) (1 diff)
-
gui/console/Makefile.in (modified) (1 diff)
-
gui/gui/Makefile.am (modified) (1 diff)
-
gui/gui/Makefile.in (modified) (2 diffs)
-
tinyxml/Makefile.am (copied) (copied from orxonox/trunk/src/lib/gui/gui/Makefile.am) (1 diff)
-
tinyxml/Makefile.in (added)
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/src/lib/Makefile.am
r3493 r4265 1 1 ### GTK_RELATED 2 if HAVE_GTK23 2 GTK_PROGS = gui 4 else5 GTK_PROGS =6 endif7 3 8 4 SUBDIRS = graphics \ 5 tinyxml \ 9 6 $(GTK_PROGS) -
orxonox/trunk/src/lib/Makefile.in
r4264 r4265 54 54 ETAGS = etags 55 55 CTAGS = ctags 56 DIST_SUBDIRS = graphics gui56 DIST_SUBDIRS = $(SUBDIRS) 57 57 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 58 58 ACLOCAL = @ACLOCAL@ … … 164 164 target_os = @target_os@ 165 165 target_vendor = @target_vendor@ 166 @HAVE_GTK2_FALSE@GTK_PROGS =167 166 168 167 ### GTK_RELATED 169 @HAVE_GTK2_TRUE@GTK_PROGS = gui168 GTK_PROGS = gui 170 169 SUBDIRS = graphics \ 170 tinyxml \ 171 171 $(GTK_PROGS) 172 172 … … 183 183 esac; \ 184 184 done; \ 185 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/lib/Makefile'; \185 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lib/Makefile'; \ 186 186 cd $(top_srcdir) && \ 187 $(AUTOMAKE) -- gnusrc/lib/Makefile187 $(AUTOMAKE) --foreign src/lib/Makefile 188 188 .PRECIOUS: Makefile 189 189 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status … … 352 352 fi; \ 353 353 done 354 list='$( DIST_SUBDIRS)'; for subdir in $$list; do \354 list='$(SUBDIRS)'; for subdir in $$list; do \ 355 355 if test "$$subdir" = .; then :; else \ 356 356 test -d "$(distdir)/$$subdir" \ -
orxonox/trunk/src/lib/graphics/Makefile.in
r4264 r4265 177 177 esac; \ 178 178 done; \ 179 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/lib/graphics/Makefile'; \179 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lib/graphics/Makefile'; \ 180 180 cd $(top_srcdir) && \ 181 $(AUTOMAKE) -- gnusrc/lib/graphics/Makefile181 $(AUTOMAKE) --foreign src/lib/graphics/Makefile 182 182 .PRECIOUS: Makefile 183 183 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/lib/graphics/importer/Makefile.in
r4264 r4265 181 181 esac; \ 182 182 done; \ 183 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/lib/graphics/importer/Makefile'; \183 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lib/graphics/importer/Makefile'; \ 184 184 cd $(top_srcdir) && \ 185 $(AUTOMAKE) -- gnusrc/lib/graphics/importer/Makefile185 $(AUTOMAKE) --foreign src/lib/graphics/importer/Makefile 186 186 .PRECIOUS: Makefile 187 187 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/lib/gui/Makefile.in
r4264 r4265 179 179 esac; \ 180 180 done; \ 181 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/lib/gui/Makefile'; \181 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lib/gui/Makefile'; \ 182 182 cd $(top_srcdir) && \ 183 $(AUTOMAKE) -- gnusrc/lib/gui/Makefile183 $(AUTOMAKE) --foreign src/lib/gui/Makefile 184 184 .PRECIOUS: Makefile 185 185 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/lib/gui/console/Makefile.in
r4264 r4265 205 205 esac; \ 206 206 done; \ 207 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/lib/gui/console/Makefile'; \207 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lib/gui/console/Makefile'; \ 208 208 cd $(top_srcdir) && \ 209 $(AUTOMAKE) -- gnusrc/lib/gui/console/Makefile209 $(AUTOMAKE) --foreign src/lib/gui/console/Makefile 210 210 .PRECIOUS: Makefile 211 211 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/lib/gui/gui/Makefile.am
r4264 r4265 1 1 MAINSRCDIR=../../.. 2 AM_CXXFLAGS=$(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS) 3 AM_CXXFLAGS+=-I$(MAINSRCDIR) 2 AM_CXXFLAGS=-I$(MAINSRCDIR) 4 3 AM_CXXFLAGS+=-I$(MAINSRCDIR)/world_entities 5 4 AM_CXXFLAGS+=-I$(MAINSRCDIR)/story_entities -
orxonox/trunk/src/lib/gui/gui/Makefile.in
r4264 r4265 197 197 target_vendor = @target_vendor@ 198 198 MAINSRCDIR = ../../.. 199 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/graphics -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 -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common199 AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -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 -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common 200 200 AM_LDFLAGS = $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) 201 201 noinst_LIBRARIES = libORXgui.a … … 240 240 esac; \ 241 241 done; \ 242 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/lib/gui/gui/Makefile'; \242 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lib/gui/gui/Makefile'; \ 243 243 cd $(top_srcdir) && \ 244 $(AUTOMAKE) -- gnusrc/lib/gui/gui/Makefile244 $(AUTOMAKE) --foreign src/lib/gui/gui/Makefile 245 245 .PRECIOUS: Makefile 246 246 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/lib/tinyxml/Makefile.am
r4264 r4265 1 MAINSRCDIR=../../.. 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/graphics 10 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer 11 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui 12 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/lang 13 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util 14 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/math 15 AM_CXXFLAGS+=-I$(MAINSRCDIR)/defs 16 AM_CXXFLAGS+=-I$(MAINSRCDIR)/font 17 AM_CXXFLAGS+=-I$(MAINSRCDIR)/network 18 AM_CXXFLAGS+=-I$(MAINSRCDIR)/glmenu 19 AM_CXXFLAGS+=-I$(MAINSRCDIR)/ai 20 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util 21 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/animation 22 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/common 1 noinst_LIBRARIES = libtinyxml.a 23 2 24 AM_LDFLAGS=$(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) 3 libtinyxml_a_SOURCES = tinyxml.cc \ 4 tinystr.cc \ 5 tinyxmlerror.cc \ 6 tinyxmlparser.cc 25 7 26 noinst_LIBRARIES = libORXgui.a 27 libORXgui_a_CPPFLAGS=$(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS) 28 29 libORXgui_a_SOURCES = gui.cc \ 30 gui_gtk.cc \ 31 gui_element.cc \ 32 gui_video.cc \ 33 gui_audio.cc \ 34 gui_exec.cc \ 35 gui_flags.cc \ 36 gui_banner.cc \ 37 gui_keys.cc \ 38 gui_update.cc 39 40 noinst_HEADERS= gui.h \ 41 gui_gtk.h \ 42 gui_element.h \ 43 gui_video.h \ 44 gui_audio.h \ 45 gui_exec.h \ 46 gui_flags.h \ 47 gui_banner.h \ 48 gui_keys.h \ 49 gui_update.h 50 51 EXTRA_DIST = rc \ 52 banner.xpm \ 53 logo.xpm 54 55 #bin_PROGRAMS=gui 56 #gui_SOURCES=gui_main.cc \ 57 # gui.cc \ 58 # gui_gtk.cc \ 59 # gui_element.cc \ 60 # gui_video.cc \ 61 # gui_audio.cc \ 62 # gui_exec.cc \ 63 # gui_flags.cc \ 64 # gui_banner.cc \ 65 # gui_keys.cc \ 66 # gui_update.cc \ 67 # $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \ 68 # $(MAINSRCDIR)/lib/lang/base_object.cc \ 69 # $(MAINSRCDIR)/lib/math/vector.cc \ 70 # $(MAINSRCDIR)/util/resource_manager.cc \ 71 # $(MAINSRCDIR)/lib/graphics/text_engine.cc \ 72 # $(MAINSRCDIR)/lib/coord/p_node.cc \ 73 # $(MAINSRCDIR)/lib/coord/null_parent.cc \ 74 # $(MAINSRCDIR)/lib/graphics/importer/array.cc \ 75 # $(MAINSRCDIR)/lib/graphics/importer/model.cc \ 76 # $(MAINSRCDIR)/lib/graphics/importer/objModel.cc \ 77 # $(MAINSRCDIR)/lib/graphics/importer/material.cc \ 78 # $(MAINSRCDIR)/lib/graphics/importer/texture.cc \ 79 # $(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc 80 # 8 noinst_HEADERS= tinyxml.h \ 9 tinystr.h
Note: See TracChangeset
for help on using the changeset viewer.
