Sophie

Sophie

distrib > Mageia > 7 > i586 > media > core-release-src > by-pkgid > c2b1b40f3daa8504c9eb8fea06e5b910 > files > 1

vdrift-20141020-8.mga7.src.rpm

Index: vdrift/SConstruct
===================================================================
--- vdrift/SConstruct
+++ vdrift/SConstruct	2016-10-27 18:42:58.752848337 +0200
@@ -47,7 +47,7 @@
         LIBPATH = ['.', '#lib', LOCALBASE + '/lib'],
         LINKFLAGS = ['-pthread','-lintl'],
         options = opts)
-    check_headers = ['GL/gl.h', 'SDL2/SDL.h', 'SDL2/SDL_image.h', 'vorbis/vorbisfile.h', 'bullet/btBulletCollisionCommon.h']
+    check_headers = ['GL/gl.h', 'SDL2/SDL.h', 'SDL2/SDL_image.h', 'vorbis/vorbisfile.h', 'BulletCollision/btBulletCollisionCommon.h']
     check_libs = []
     if 'CC' in os.environ:
         env.Replace(CC = os.environ['CC'])
@@ -134,7 +134,7 @@
 #-------------#
 else:
     env = Environment(ENV = os.environ,
-        CPPPATH = ['#src'],
+        CPPPATH = ['#src', '/usr/include/bullet'],
         CCFLAGS = ['-Wall', '-Wextra', '-Wno-unused-parameter'],#, '-pthread'],
         LIBPATH = ['.', '#lib'],
         #LINKFLAGS = ['-pthread'],
@@ -147,7 +147,7 @@
         env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
     if os.environ.has_key('LDFLAGS'):
         env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
-    check_headers = ['GL/gl.h', 'SDL2/SDL.h', 'SDL2/SDL_image.h', 'vorbis/vorbisfile.h', 'curl/curl.h', 'bullet/btBulletCollisionCommon.h', 'bullet/btBulletDynamicsCommon.h']
+    check_headers = ['GL/gl.h', 'SDL2/SDL.h', 'SDL2/SDL_image.h', 'vorbis/vorbisfile.h', 'curl/curl.h', 'BulletCollision/btBulletCollisionCommon.h', 'BulletDynamics/btBulletDynamicsCommon.h']
     check_libs = []
 
 if ARGUMENTS.get('verbose') != "1":
Index: vdrift/src/physics/dynamicsworld.h
===================================================================
--- vdrift/src/physics/dynamicsworld.h
+++ vdrift/src/physics/dynamicsworld.h	2016-10-27 18:42:45.995411042 +0200
@@ -20,8 +20,8 @@
 #ifndef _DYNAMICSWORLD_H
 #define _DYNAMICSWORLD_H
 
-#include "btBulletCollisionCommon.h"
-#include "btBulletDynamicsCommon.h"
+#include "BulletCollision/btBulletCollisionCommon.h"
+#include "BulletDynamics/btBulletDynamicsCommon.h"
 
 #include <iosfwd>