Explorar el Código

rename Thread in OsThread

mikymod hace 12 años
padre
commit
09f4d376db

+ 4 - 5
engine/CMakeLists.txt

@@ -442,7 +442,7 @@ if (WINDOWS)
 	list (APPEND OS_HEADERS
 		os/win/OsWindow.h
 		os/win/OsFile.h
-		os/win/Thread.h
+		os/win/OsThread.h
 		os/win/Mutex.h
 		os/win/Cond.h
 		os/win/Semaphore.h
@@ -473,7 +473,6 @@ if (WINDOWS)
 	)
 
 	set (COMPILER_FLAGS
-		/Wall
 	)
 
 	set (CROWN_MAIN_SRC os/win/main.cpp)
@@ -534,8 +533,8 @@ 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)
+#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)
@@ -543,7 +542,7 @@ 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 (TARGETS crown-linux-renderer-evo DESTINATION bin)
 
 #install (FILES ${HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME})
 

+ 1 - 1
engine/ConsoleServer.h

@@ -28,7 +28,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #include "Types.h"
 #include "TCPSocket.h"
-#include "Thread.h"
+#include "OsThread.h"
 #include "Mutex.h"
 
 namespace crown

+ 0 - 0
engine/os/win/Thread.h → engine/os/win/OsThread.h


+ 2 - 2
engine/resource/ResourceLoader.h

@@ -28,7 +28,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #include "Types.h"
 #include "Resource.h"
-#include "Thread.h"
+#include "OsThread.h"
 #include "Queue.h"
 #include "List.h"
 #include "Mutex.h"
@@ -108,7 +108,7 @@ private:
 
 private:
 
-	Thread					m_thread;
+	OsThread				m_thread;
 	bool					m_should_run;
 
 	// Whether to look for resources