Changeset 3659 in orxonox.OLD

Timestamp:

Mar 28, 2005, 3:26:17 PM (19 years ago)

Author:

dave

Message:

branches/shadows/src: ich hab jetzt mal meinen Branche ruebergenommen in den Shadow, weil ich die Textur des Bodens auch dort brauchen werde

Location:

orxonox/branches

Files:

• dave/src/Makefile.in (modified) (3 diffs)
• dave/src/orxonox.cc (modified) (1 diff)
• shadows/Makefile.in (modified) (4 diffs)

orxonox/branches/dave/src/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
 # @configure_input@
 
@@ -548 +548 @@
         tags=; \
         here=`pwd`; \
-        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+        if (etags --etags-include --version) >/dev/null 2>&1; then \
           include_option=--etags-include; \
-          empty_fix=.; \
         else \
           include_option=--include; \
-          empty_fix=; \
         fi; \
         list='$(SUBDIRS)'; for subdir in $$list; do \
           if test "$$subdir" = .; then :; else \
-            test ! -f $$subdir/TAGS || \
+            test -f $$subdir/TAGS && \
               tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
           fi; \
@@ -567 +565 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-            $$tags $$unique; \
-        fi
+        test -z "$(ETAGS_ARGS)$$tags$$unique" \
+          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             $$tags $$unique
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

orxonox/branches/dave/src/orxonox.cc

@@ -132 +132 @@
 
   int bpp = 16;
-  int width = 640;
-  int height = 480;
+  int width = 400;
+  int height = 300;
   //Uint32 flags = SDL_HWSURFACE | SDL_OPENGL | SDL_GL_DOUBLEBUFFER; /* \todo: SDL_OPENGL doen't permit to load images*/
   //Uint32 flags = SDL_HWSURFACE | SDL_GL_DOUBLEBUFFER;

orxonox/branches/shadows/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
 # @configure_input@
 
@@ -318 +318 @@
         tags=; \
         here=`pwd`; \
-        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+        if (etags --etags-include --version) >/dev/null 2>&1; then \
           include_option=--etags-include; \
-          empty_fix=.; \
         else \
           include_option=--include; \
-          empty_fix=; \
         fi; \
         list='$(SUBDIRS)'; for subdir in $$list; do \
           if test "$$subdir" = .; then :; else \
-            test ! -f $$subdir/TAGS || \
+            test -f $$subdir/TAGS && \
               tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
           fi; \
@@ -337 +335 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-            $$tags $$unique; \
-        fi
+        test -z "$(ETAGS_ARGS)$$tags$$unique" \
+          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             $$tags $$unique
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
@@ -450 +446 @@
           uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
         *.shar.gz*) \
-          GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+          GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\
         *.zip*) \
           unzip $(distdir).zip ;;\