added a direct Xlib implementation of font bitmap generation, disabled

[xonotic/netradiant.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 9dfda4b2e7e4a15ee3557fdca5f0e2040bda5875..db5d1fd672b6c70573b240a775fd87175e242270 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -169,8 +169,8 @@ CCFLAGS = '-DPOSIX -DXWINDOWS ' + warningFlags
 CXXFLAGS = '-pipe -DPOSIX -DXWINDOWS ' + warningFlags + warningFlagsCXX
 CPPPATH = []
 if (BUILD == 'debug'):
-       CXXFLAGS += '-g -D_DEBUG '
-       CCFLAGS += '-g -D_DEBUG '
+       CXXFLAGS += '-g3 -D_DEBUG '
+       CCFLAGS += '-g3 -D_DEBUG '
 elif (BUILD == 'release' or BUILD == 'final'):
        CXXFLAGS += '-O2 '
        CCFLAGS += '-O2 '
@@ -255,10 +255,11 @@ class idEnvironment(Environment):
   def useGtkGLExt(self):
     self['CXXFLAGS'] += '`pkg-config gtkglext-1.0 --cflags` '
     self['CCFLAGS'] += '`pkg-config gtkglext-1.0 --cflags` '
-    if BUILD == 'final':
-      self['LINKFLAGS'] += '-lgtkglext-x11-1.0 -lgdkglext-x11-1.0 '      
-    else:
-      self['LINKFLAGS'] += 'pkg-config gtkglext-1.0 --libs-only-L` `pkg-config gtkglext-1.0 --libs-only-l` '      
+    #if BUILD == 'final':
+    self['LINKFLAGS'] += '-lgtkglext-x11-1.0 -lgdkglext-x11-1.0 '
+    # apparently pkg-config for gtkglext includes --export-dynamic, which b0rks everything.     
+    #else:
+    #  self['LINKFLAGS'] += 'pkg-config gtkglext-1.0 --libs-only-L` `pkg-config gtkglext-1.0 --libs-only-l` '      
     
   def usePNG(self):
     self['CXXFLAGS'] += '`libpng-config --cflags` '