瀏覽代碼

win MAX_PATH_LENGTH included and cmake file updated

mikymod 12 年之前
父節點
當前提交
aa025be566
共有 3 個文件被更改,包括 28 次插入5 次删除
  1. 5 0
      CMakeLists.txt
  2. 19 5
      src/CMakeLists.txt
  3. 4 0
      src/os/OS.h

+ 5 - 0
CMakeLists.txt

@@ -64,6 +64,11 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 	set(WINDOWS 1)
+
+	list (APPEND CROWN_INCLUDES
+		${CMAKE_SOURCE_DIR}/src/os/win
+		${CMAKE_SOURCE_DIR}/src/renderers/gl/wgl
+	)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 
 include_directories(${CROWN_INCLUDES} ${CROWN_LUAJIT_INCLUDES})

+ 19 - 5
src/CMakeLists.txt

@@ -307,21 +307,35 @@ endif (LINUX)
 if (WINDOWS)
 	list (APPEND OS_HEADERS
 		os/win/OsWindow.h
-		os/win/TCPSocket.h
-		os/win/UDPSocket.h
 		os/win/OsFile.h
-		os/win/Thread.h
-		os/win/Mutex.h
-		os/win/Cond.h
+#		os/win/TCPSocket.h
+#		os/win/UDPSocket.h
+#		os/win/Thread.h
+#		os/win/Mutex.h
+#		os/win/Cond.h
 	)
 
 	list (APPEND OS_SRC
 		os/win/WinOS.cpp
+		os/win/OsWindow.cpp
+		os/win/OsFile.cpp
+	)
+
+	list (APPEND RENDERERS_SRC
+		renderers/gl/GLRenderer.cpp
+		renderers/gl/GLUtils.cpp
+		renderers/gl/wgl/GLContext.cpp
+	)
 
+	list (APPEND RENDERERS_HEADERS
+		renderers/gl/GLRenderer.h
+		renderers/gl/GLUtils.h
+		renderers/gl/wgl/GLContext.h
 	)
 
 	set (CROWN_EXECUTABLE_NAME crown-win)
 	set (CROWN_MAIN_SRC os/win/main.cpp)
+
 endif(WINDOWS)
 
 set (CROWN_SOURCES

+ 4 - 0
src/os/OS.h

@@ -38,7 +38,11 @@ namespace crown
 #ifdef LINUX
 const size_t	MAX_PATH_LENGTH = 1024;
 const char		PATH_SEPARATOR = '/';
+#endif
 
+#ifdef WINDOWS
+const size_t	MAX_PATH_LENGTH = 1024;
+const char		PATH_SEPARATOR = '\\';
 #endif
 
 namespace os