Changeset 3196 in orxonox.OLD for orxonox/trunk/src/importer

Timestamp:

Dec 17, 2004, 12:17:52 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: moved importer into the Trunk, now no merging is needed anymore.

Location:

orxonox/trunk/src/importer

Files:

• . (moved) (moved from orxonox/trunk/importer)
• Makefile.in (modified) (3 diffs)
• array.h (modified) (1 diff)
• framework.cc (modified) (2 diffs)
• material.h (modified) (1 diff)
• object.cc (modified) (1 diff)
• object.h (modified) (2 diffs)
• windowHandler.h (modified) (1 diff)

orxonox/trunk/src/importer/Makefile.in

@@ -24 +24 @@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
+top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
@@ -40 +40 @@
 host_triplet = @host@
 bin_PROGRAMS = importer$(EXEEXT)
-subdir = importer
+subdir = src/importer
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
         $(srcdir)/Makefile.in
@@ -199 +199 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  importer/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/importer/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  importer/Makefile
+          $(AUTOMAKE) --foreign  src/importer/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

orxonox/trunk/src/importer/array.h

@@ -11 +11 @@
 extern int verbose; //!< will be obsolete soon
 
-#include "stdincl.h"
+#include "../stdincl.h"
 #include <fstream>
 

orxonox/trunk/src/importer/framework.cc

@@ -16 +16 @@
 #include "framework.h"
 
-int verbose = 2;
 
 void DrawGLScene()
@@ -53 +52 @@
 int main(int argc, char *argv[])
 {
+  int verbose = 2;
   Uint8* keys; // This variable will be used in the keyboard routine
   int done=FALSE; // We aren't done yet, are we?

orxonox/trunk/src/importer/material.h

@@ -13 +13 @@
 extern int verbose; //!< will be obsolete soon.
 
-#include "stdincl.h"
+#include "../stdincl.h"
 
 #if HAVE_CONFIG_H 

orxonox/trunk/src/importer/object.cc

@@ -15 +15 @@
 
 #include "object.h"
+int verbose = 1; //! \todo should be GLOBAL
 using namespace std;
 

orxonox/trunk/src/importer/object.h

@@ -7 +7 @@
 #define _OBJECT_H
 
-#include "stdincl.h"
+#include "../stdincl.h"
 
 #include "array.h"
@@ -16 +16 @@
 using namespace std;
 
-extern int verbose; //!< Will be removed and added again as a verbose-class.
 
 

orxonox/trunk/src/importer/windowHandler.h

@@ -4 +4 @@
 extern int verbose;
 
-#include "stdincl.h"
+#include "../stdincl.h"
 
 #include <stdarg.h>