This commit is contained in:
ejcoumans
2006-09-20 03:04:40 +00:00
parent c779f05989
commit 69c11061c3
5 changed files with 17 additions and 16 deletions

View File

@@ -429,12 +429,13 @@ void initCubeVBO ()
cubeShader = NULL ; cubeShader = NULL ;
else else
{ {
//the filenames have additional path to make it easier for some platforms
if ( noVertexTextureSupport ) if ( noVertexTextureSupport )
cubeShader = new GLSL_ShaderPair ( "CubeShader", "cubeShaderNoTexture.vert", cubeShader = new GLSL_ShaderPair ( "CubeShader", "../../Extras/GPUphysics/cubeShaderNoTexture.vert",
"cubeShader.frag" ) ; "../../Extras/GPUphysics/cubeShader.frag" ) ;
else else
cubeShader = new GLSL_ShaderPair ( "CubeShader", "cubeShader.vert", cubeShader = new GLSL_ShaderPair ( "CubeShader", "../../Extras/GPUphysics/cubeShader.vert",
"cubeShader.frag" ) ; "../../Extras/GPUphysics/cubeShader.frag" ) ;
assert ( cubeShader -> compiledOK () ) ; assert ( cubeShader -> compiledOK () ) ;
} }
} }

View File

@@ -5,14 +5,14 @@ OBJS = GPU_physics_demo.o fboSupport.o shaderSupport.o
all: ${OBJS} all: ${OBJS}
g++ -o GPU_physics_demo ${OBJS} -lglut -lGLEW -lGL g++ -o GPU_physics_demo ${OBJS} -lglut -lGLEW -lGL
shaderSupport.o : shaderSupport.cxx ${HDRS} shaderSupport.o : shaderSupport.cpp ${HDRS}
g++ -c shaderSupport.cxx g++ -c shaderSupport.cpp
fboSupport.o : fboSupport.cxx ${HDRS} fboSupport.o : fboSupport.cpp ${HDRS}
g++ -c fboSupport.cxx g++ -c fboSupport.cpp
GPU_physics_demo.o : GPU_physics_demo.cxx ${HDRS} GPU_physics_demo.o : GPU_physics_demo.cpp ${HDRS}
g++ -c GPU_physics_demo.cxx g++ -c GPU_physics_demo.cpp
clean: clean:
-rm -f ${OBJS} -rm -f ${OBJS}

View File

@@ -5,14 +5,14 @@ OBJS = GPU_physics_demo.o fboSupport.o shaderSupport.o
all: ${OBJS} 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 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} shaderSupport.o : shaderSupport.cpp ${HDRS}
g++ -c shaderSupport.cxx g++ -c shaderSupport.cpp
fboSupport.o : fboSupport.cxx ${HDRS} fboSupport.o : fboSupport.cpp ${HDRS}
g++ -c fboSupport.cxx g++ -c fboSupport.cpp
GPU_physics_demo.o : GPU_physics_demo.cxx ${HDRS} GPU_physics_demo.o : GPU_physics_demo.cpp ${HDRS}
g++ -c GPU_physics_demo.cxx g++ -c GPU_physics_demo.cpp
clean: clean:
-rm -f ${OBJS} -rm -f ${OBJS}