瀏覽代碼

Temporarily fix linux main

Daniele Bartolini 12 年之前
父節點
當前提交
0832e60c72
共有 2 個文件被更改,包括 7 次插入1 次删除
  1. 4 0
      engine/CMakeLists.txt
  2. 3 1
      engine/os/linux/main.cpp

+ 4 - 0
engine/CMakeLists.txt

@@ -539,12 +539,16 @@ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}:$ORIGIN")
 add_executable(${CROWN_EXECUTABLE_NAME} ${CROWN_MAIN_SRC})
 target_link_libraries(${CROWN_EXECUTABLE_NAME} crown)
 
+add_executable(crown-linux-renderer-evo os/linux/main2.cpp)
+target_link_libraries(crown-linux-renderer-evo crown)
+
 if (CROWN_BUILD_TESTS)
 	#add_subdirectory(tests)
 endif (CROWN_BUILD_TESTS)
 
 install (TARGETS crown DESTINATION bin)
 install (TARGETS ${CROWN_EXECUTABLE_NAME} DESTINATION bin)
+install (TARGETS crown-linux-renderer-evo DESTINATION bin)
 
 #install (FILES ${HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME})
 

+ 3 - 1
engine/os/linux/main.cpp

@@ -29,6 +29,8 @@ OTHER DEALINGS IN THE SOFTWARE.
 namespace crown
 {
 
+void draw(float) {}
+
 struct MainArgs
 {
 	int argc;
@@ -51,7 +53,7 @@ int32_t main_thread(void* data)
 
 	while (engine->is_running())
 	{
-		engine->frame();
+		engine->frame(draw);
 	}
 
 	engine->shutdown();