- bugfix

Author: janbender

Demos/CouplingDemos/RigidBodyClothCouplingDemo.cpp

@@ -136,9 +136,9 @@ int main( int argc, char **argv )
 
 void initShader()
 {
-	std::string vertFile = std::string(PBD_DATA_PATH) + "/shaders/vs_flat.glsl";
-	std::string geomFile = std::string(PBD_DATA_PATH) + "/shaders/gs_flat.glsl";
-	std::string fragFile = std::string(PBD_DATA_PATH) + "/shaders/fs_flat.glsl";
+	std::string vertFile = dataPath + "/shaders/vs_flat.glsl";
+	std::string geomFile = dataPath + "/shaders/gs_flat.glsl";
+	std::string fragFile = dataPath + "/shaders/fs_flat.glsl";
 	shader = MiniGL::createShader(vertFile, geomFile, fragFile);
 
 	if (shader == NULL)
@@ -152,8 +152,8 @@ void initShader()
 	shader->addUniform("specular_factor");
 	shader->end();
 
-	vertFile = std::string(PBD_DATA_PATH) + "/shaders/vs_smoothTex.glsl";
-	fragFile = std::string(PBD_DATA_PATH) + "/shaders/fs_smoothTex.glsl";
+	vertFile = dataPath + "/shaders/vs_smoothTex.glsl";
+	fragFile = dataPath + "/shaders/fs_smoothTex.glsl";
 	shaderTex = MiniGL::createShader(vertFile, "", fragFile);
 
 	if (shaderTex == NULL)
@@ -397,7 +397,7 @@ void createRigidBodyModel()
 	SimulationModel::RigidBodyVector &rb = model.getRigidBodies();
 	SimulationModel::ConstraintVector &constraints = model.getConstraints();
 
-	string fileName = string(PBD_DATA_PATH) + "/models/cube.obj";
+	string fileName = dataPath + "/models/cube.obj";
 	IndexedFaceMesh mesh;
 	VertexData vd;
 	OBJLoader::loadObj(fileName, vd, mesh, Eigen::Vector3f(width, height, depth));

extern/freeglut/src/CMakeLists.txt

@@ -66,10 +66,6 @@ add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 set_target_properties(freeglut PROPERTIES FOLDER "External Dependencies")
 include_directories(${PROJECT_PATH}/extern/freeglut/include)
 
-if (WIN32)
-	add_custom_command(
-	   TARGET freeglut
-	   POST_BUILD
-	   COMMAND xcopy /r /y \"$\(TargetPath\)" \"$\(TargetDir\)..\\..\\bin\\$\(ConfigurationName\)\\"
-	)                        
-endif (WIN32)
+
+
+

extern/glew/CMakeLists.txt

@@ -11,11 +11,5 @@ set_target_properties(glew PROPERTIES FOLDER "External Dependencies")
 add_definitions(-DGLEW_NO_GLU -DGLEW_BUILD)
 
 if (WIN32)
-	target_link_libraries(glew opengl32.lib)
-
-	add_custom_command(
-	   TARGET glew
-	   POST_BUILD
-	   COMMAND xcopy /r /y \"$\(TargetPath\)" \"$\(TargetDir\)..\\..\\bin\\$\(ConfigurationName\)\\"
-	)                        
+	target_link_libraries(glew opengl32.lib)                     
 endif()