add polycode mesh sample to the test #5

TheGreenBox · Aug 3, 2013 · b4aaa6c · b4aaa6c
1 parent 151f183
commit b4aaa6c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/cmake/heliumIncludes.cmake b/cmake/heliumIncludes.cmake
@@ -37,9 +37,17 @@ ELSE()
     MESSAGE (ERROR "CMAKE_BUILD_TYPE must be defined")
 ENDIF()
 
-IF( WIN32 )
-    SET ( LIB_POLYCODE ${LIB_POLYCODE} ws2_32 Winmm )
-ENDIF( WIN32 )
+IF( UNIX )
+    SET ( LIB_POLYCODE 
+            ${LIB_POLYCODE} 
+            -ldl 
+        )
+ELSEIF( WIN32 )
+    SET ( LIB_POLYCODE 
+            ${LIB_POLYCODE} 
+            ws2_32 Winmm 
+        )
+ENDIF( )
 
 
 INCLUDE_DIRECTORIES ( ${HELIUM_MODULES_DIR}/heliumGameCore/include

diff --git a/tests/first3DModel/CMakeLists.txt b/tests/first3DModel/CMakeLists.txt
@@ -29,13 +29,13 @@ ADD_EXECUTABLE ( first3DModel
                )
 
 IF(WIN32)
-    set_target_properties( first3DModel PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:windows") 
-    set_target_properties( first3DModel PROPERTIES COMPILE_DEFINITIONS_DEBUG "_WINDOWS")
-    set_target_properties( first3DModel PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:windows")
+    set_target_properties( first3DModel PROPERTIES LINK_FLAGS_DEBUG                   "/SUBSYSTEM:windows") 
+    set_target_properties( first3DModel PROPERTIES COMPILE_DEFINITIONS_DEBUG          "_WINDOWS")
+    set_target_properties( first3DModel PROPERTIES LINK_FLAGS_RELWITHDEBINFO          "/SUBSYSTEM:windows")
     set_target_properties( first3DModel PROPERTIES COMPILE_DEFINITIONS_RELWITHDEBINFO "_WINDOWS")
-    set_target_properties( first3DModel PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:windows")
-    set_target_properties( first3DModel PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:windows")
-    SET_TARGET_PROPERTIES( first3DModel PROPERTIES COMPILE_DEFINITIONS _UNICODE,UNICODE)
+    set_target_properties( first3DModel PROPERTIES LINK_FLAGS_RELEASE                 "/SUBSYSTEM:windows")
+    set_target_properties( first3DModel PROPERTIES LINK_FLAGS_MINSIZEREL              "/SUBSYSTEM:windows")
+    SET_TARGET_PROPERTIES( first3DModel PROPERTIES COMPILE_DEFINITIONS                _UNICODE,UNICODE)
 ENDIF(WIN32)
 
 TARGET_LINK_LIBRARIES ( first3DModel

diff --git a/tests/first3DModel/src/main.cpp b/tests/first3DModel/src/main.cpp
@@ -28,10 +28,10 @@ APP_MAIN_FINCTION
 {
     std::cout << "Hello! 3D Model learning test.\n";
     Polycode::String mesh_path(HELIUM_RESOURCE_PATH_FROM_TEST);
-    mesh_path += "/test_blend.mesh";
+    mesh_path += "/polycode_smpl.mesh";
     std::cout << "Path to 3d model: " << mesh_path.c_str() << '\n';
 
-    Polycode::Mesh mesh(mesh_path);
+    Polycode::SceneMesh* mesh = new Polycode::SceneMesh(mesh_path);
 
     return 0;
 }