This commit is contained in:
@@ -429,12 +429,13 @@ void initCubeVBO ()
|
||||
cubeShader = NULL ;
|
||||
else
|
||||
{
|
||||
//the filenames have additional path to make it easier for some platforms
|
||||
if ( noVertexTextureSupport )
|
||||
cubeShader = new GLSL_ShaderPair ( "CubeShader", "cubeShaderNoTexture.vert",
|
||||
"cubeShader.frag" ) ;
|
||||
cubeShader = new GLSL_ShaderPair ( "CubeShader", "../../Extras/GPUphysics/cubeShaderNoTexture.vert",
|
||||
"../../Extras/GPUphysics/cubeShader.frag" ) ;
|
||||
else
|
||||
cubeShader = new GLSL_ShaderPair ( "CubeShader", "cubeShader.vert",
|
||||
"cubeShader.frag" ) ;
|
||||
cubeShader = new GLSL_ShaderPair ( "CubeShader", "../../Extras/GPUphysics/cubeShader.vert",
|
||||
"../../Extras/GPUphysics/cubeShader.frag" ) ;
|
||||
assert ( cubeShader -> compiledOK () ) ;
|
||||
}
|
||||
}
|
||||
@@ -5,14 +5,14 @@ OBJS = GPU_physics_demo.o fboSupport.o shaderSupport.o
|
||||
all: ${OBJS}
|
||||
g++ -o GPU_physics_demo ${OBJS} -lglut -lGLEW -lGL
|
||||
|
||||
shaderSupport.o : shaderSupport.cxx ${HDRS}
|
||||
g++ -c shaderSupport.cxx
|
||||
shaderSupport.o : shaderSupport.cpp ${HDRS}
|
||||
g++ -c shaderSupport.cpp
|
||||
|
||||
fboSupport.o : fboSupport.cxx ${HDRS}
|
||||
g++ -c fboSupport.cxx
|
||||
fboSupport.o : fboSupport.cpp ${HDRS}
|
||||
g++ -c fboSupport.cpp
|
||||
|
||||
GPU_physics_demo.o : GPU_physics_demo.cxx ${HDRS}
|
||||
g++ -c GPU_physics_demo.cxx
|
||||
GPU_physics_demo.o : GPU_physics_demo.cpp ${HDRS}
|
||||
g++ -c GPU_physics_demo.cpp
|
||||
|
||||
clean:
|
||||
-rm -f ${OBJS}
|
||||
|
||||
@@ -5,14 +5,14 @@ OBJS = GPU_physics_demo.o fboSupport.o shaderSupport.o
|
||||
all: ${OBJS}
|
||||
g++ -framework GLUT -framework OpenGL -L"/System/Library/Frameworks/OpenGL.framework/Libraries" -lGL -lGLU -o GPU_physics_demo ${OBJS} -L"/System/Library/Frameworks/OpenGL.framework/Libraries" -lGLU -lGLEW -lGL -lGLU -lobjc
|
||||
|
||||
shaderSupport.o : shaderSupport.cxx ${HDRS}
|
||||
g++ -c shaderSupport.cxx
|
||||
shaderSupport.o : shaderSupport.cpp ${HDRS}
|
||||
g++ -c shaderSupport.cpp
|
||||
|
||||
fboSupport.o : fboSupport.cxx ${HDRS}
|
||||
g++ -c fboSupport.cxx
|
||||
fboSupport.o : fboSupport.cpp ${HDRS}
|
||||
g++ -c fboSupport.cpp
|
||||
|
||||
GPU_physics_demo.o : GPU_physics_demo.cxx ${HDRS}
|
||||
g++ -c GPU_physics_demo.cxx
|
||||
GPU_physics_demo.o : GPU_physics_demo.cpp ${HDRS}
|
||||
g++ -c GPU_physics_demo.cpp
|
||||
|
||||
clean:
|
||||
-rm -f ${OBJS}
|
||||
|
||||
Reference in New Issue
Block a user