Changeset 8145 in orxonox.OLD for trunk/src/defs

Timestamp:

Jun 5, 2006, 11:49:26 AM (19 years ago)

Author:

bensch

Message:

trunk: merged the gui back
merged with command:
svn merge -r8114:HEAD ​https://svn.orxonox.net/orxonox/branches/gui .
→ no conflicts

Location:

trunk/src/defs

Files:

• debug.h (modified) (11 diffs)
• include_paths.am (modified) (1 diff)

trunk/src/defs/debug.h

@@ -131 +131 @@
 #define PRINTF1 \
     if (SOFT_DEBUG_LEVEL >= ORX_ERR) \
-      printf("(EE)::%s:%d:", __FILE__, __LINE__) && PRINT_EXEC
-#else
-#define PRINTF1 if (ORX_NONE)
+      printf("(EE)::%s:%d:", __FILE__, __LINE__), PRINT_EXEC
+#else
+#define PRINTF1 if (ORX_NONE) PRINT_EXEC
 #endif
 
@@ -139 +139 @@
 #define PRINTF2 \
      if (SOFT_DEBUG_LEVEL >= ORX_WARN) \
-       printf("(WW)::%s:%d:", __FILE__, __LINE__) && PRINT_EXEC
-
-#else
-#define PRINTF2 if (ORX_NONE)
+       printf("(WW)::%s:%d:", __FILE__, __LINE__), PRINT_EXEC
+
+#else
+#define PRINTF2 if (ORX_NONE) PRINT_EXEC
 #endif
 
@@ -148 +148 @@
 #define PRINTF3 \
      if (SOFT_DEBUG_LEVEL >= ORX_INFO) \
-       printf("(II)::%s:%d:", __FILE__, __LINE__) && PRINT_EXEC
-#else
-#define PRINTF3 if (ORX_NONE)
+       printf("(II)::%s:%d:", __FILE__, __LINE__), PRINT_EXEC
+#else
+#define PRINTF3 if (ORX_NONE) PRINT_EXEC
 #endif
 
@@ -156 +156 @@
 #define PRINTF4 \
      if (SOFT_DEBUG_LEVEL >= ORX_DEBUG) \
-       printf("(DD)::%s:%d:", __FILE__, __LINE__) && PRINT_EXEC
-#else
-#define PRINTF4 if (ORX_NONE)
+       printf("(DD)::%s:%d:", __FILE__, __LINE__), PRINT_EXEC
+#else
+#define PRINTF4 if (ORX_NONE) PRINT_EXEC
 #endif
 
@@ -164 +164 @@
 #define PRINTF5 \
      if (SOFT_DEBUG_LEVEL >= ORX_vDEBUG) \
-       printf("(VD)::%s:%d:", __FILE__, __LINE__) && PRINT_EXEC
-#else
-#define PRINTF5 if (ORX_NONE)
+       printf("(VD)::%s:%d:", __FILE__, __LINE__), PRINT_EXEC
+#else
+#define PRINTF5 if (ORX_NONE) PRINT_EXEC
 #endif
 
@@ -174 +174 @@
 
 #define PRINTF0 \
-    printf("%s:%d::", __FILE__, __LINE__) && PRINT_EXEC
+    printf("%s:%d::", __FILE__, __LINE__), PRINT_EXEC
 #endif
 
@@ -196 +196 @@
     PRINT_EXEC
 #else
-#define PRINT1 if (ORX_NONE)
+#define PRINT1 if (ORX_NONE) PRINT_EXEC
 #endif
 
@@ -205 +205 @@
 
 #else
-#define PRINT2 if (ORX_NONE)
+#define PRINT2 if (ORX_NONE) PRINT_EXEC
 #endif
 
@@ -213 +213 @@
     PRINT_EXEC
 #else
-#define PRINT3 if (ORX_NONE)
+#define PRINT3 if (ORX_NONE) PRINT_EXEC
 #endif
 
@@ -221 +221 @@
     PRINT_EXEC
 #else
-#define PRINT4 if (ORX_NONE)
+#define PRINT4 if (ORX_NONE) PRINT_EXEC
 #endif
 
@@ -229 +229 @@
        PRINT_EXEC
 #else
-#define PRINT5 if (ORX_NONE)
+#define PRINT5 if (ORX_NONE) PRINT_EXEC
 #endif
 

trunk/src/defs/include_paths.am

@@ -12 +12 @@
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/render2D
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/particles
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gtk_gui
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gl_gui
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gl_gui/glmenu
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gl
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gl/glmenu
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/lang
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/shell