Joseph Gilbert's fixes for the linux2 build target.
authorKent Mein <mein@cs.umn.edu>
Tue, 15 Feb 2005 13:06:08 +0000 (13:06 +0000)
committerKent Mein <mein@cs.umn.edu>
Tue, 15 Feb 2005 13:06:08 +0000 (13:06 +0000)
Kent

SConstruct
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript

index cd7a9a62d23b115157b733623d1adb041b66b64f..ce3e77bccb27cc9612297b69ec1c987e06682962 100644 (file)
@@ -90,7 +90,7 @@ if sys.platform == 'linux2' or sys.platform == 'linux-i386':
        opengl_lib = ['GL', 'GLU']
        opengl_static = ['/usr/lib/libGL.a', '/usr/lib/libGLU.a']
        opengl_libpath = ['/usr/lib', '/usr/X11R6/lib']
-       opengl_include = ['/usr/include']
+       opengl_include = ['/usr/include', '/usr/X11R6/include']
        # SDL library information
        sdl_env.ParseConfig ('sdl-config --cflags --libs')
        sdl_cflags = sdl_env.Dictionary()['CCFLAGS']
index 7853cafb6c0864088fbfcebfad3f50eec249e96d..6baebd0fabcb8a0925587d5f00dab78efd51fe85 100755 (executable)
@@ -14,5 +14,6 @@ ras_openglrasterizer_env.Append (CPPPATH=['.',
                                           '#intern/moto/include',
                                           '#source/gameengine/Rasterizer'
                                          ])
+ras_openglrasterizer_env.Append (CPPPATH = user_options_dict['OPENGL_INCLUDE'])
 
 ras_openglrasterizer_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/RAS_OpenGLRasterizer', source=source_files)