Răsfoiți Sursa

String renamed to StringUtils because windows sucks

mikymod 12 ani în urmă
părinte
comite
c7eb19056a

+ 20 - 0
src/CMakeLists.txt

@@ -304,6 +304,26 @@ if (LINUX)
 	set (CROWN_MAIN_SRC os/linux/main.cpp)
 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
+	)
+
+	list (APPEND OS_SRC
+		os/win/WinOS.cpp
+
+	)
+
+	set (CROWN_EXECUTABLE_NAME crown-win)
+	set (CROWN_MAIN_SRC os/win/main.cpp)
+endif(WINDOWS)
+
 set (CROWN_SOURCES
 	${SRC}
 	${CORE_SRC}

+ 1 - 1
src/Crown.h

@@ -66,7 +66,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "IdTable.h"
 
 // Core/Strings
-#include "String.h"
+#include "StringUtils.h"
 #include "Hash.h"
 #include "Path.h"
 

+ 1 - 1
src/Device.cpp

@@ -35,7 +35,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "Renderer.h"
 #include "DebugRenderer.h"
 #include "Types.h"
-#include "String.h"
+#include "StringUtils.h"
 #include "Args.h"
 #include "Game.h"
 #include <cstdlib>

+ 1 - 1
src/FileBundle.cpp

@@ -30,7 +30,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "Resource.h"
 #include "DiskFile.h"
 #include "Log.h"
-#include "String.h"
+#include "StringUtils.h"
 
 namespace crown
 {

+ 1 - 1
src/Resource.h

@@ -28,7 +28,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #include "Types.h"
 #include "Hash.h"
-#include "String.h"
+#include "StringUtils.h"
 
 namespace crown
 {

+ 1 - 1
src/ResourceManager.cpp

@@ -29,7 +29,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #include "Types.h"
 #include "ResourceManager.h"
-#include "String.h"
+#include "StringUtils.h"
 #include "Hash.h"
 #include "Path.h"
 #include "Log.h"

+ 1 - 1
tools/compilers/resource-linker.cpp

@@ -2,7 +2,7 @@
 #include "Filesystem.h"
 #include "File.h"
 #include "Path.h"
-#include "String.h"
+#include "StringUtils.h"
 #include "Hash.h"
 #include "Resource.h"
 #include "Bundle.h"