Browse Source

Update Windows build

Panagiotis Christopoulos Charitos 10 years ago
parent
commit
08a43cdf92
3 changed files with 14 additions and 16 deletions
  1. 2 2
      src/CMakeLists.txt
  2. 11 13
      src/util/FilesystemWindows.cpp
  3. 1 1
      thirdparty

+ 2 - 2
src/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
 #
-# Set platform specific 
+# Set platform specific
 #
 #
 if(LINUX)
 if(LINUX)
 	set(_SYS GL ankiglew pthread)
 	set(_SYS GL ankiglew pthread)
@@ -13,7 +13,7 @@ elseif(ANDROID)
 elseif(WINDOWS)
 elseif(WINDOWS)
 	set(_SYS ankiglew opengl32 version)
 	set(_SYS ankiglew opengl32 version)
 
 
-	add_definitions("-DGLEW_STATIC")
+	add_definitions("-DGLEW_STATIC" "-D_NEWTON_STATIC_LIB")
 else()
 else()
 	message(FATAL_ERROR "Unhandled case")
 	message(FATAL_ERROR "Unhandled case")
 endif()
 endif()

+ 11 - 13
src/util/FilesystemWindows.cpp

@@ -18,7 +18,7 @@ Bool fileExists(const CString& filename)
 {
 {
 	DWORD dwAttrib = GetFileAttributes(&filename[0]);
 	DWORD dwAttrib = GetFileAttributes(&filename[0]);
 
 
-	return dwAttrib != INVALID_FILE_ATTRIBUTES 
+	return dwAttrib != INVALID_FILE_ATTRIBUTES
 		&& !(dwAttrib & FILE_ATTRIBUTE_DIRECTORY);
 		&& !(dwAttrib & FILE_ATTRIBUTE_DIRECTORY);
 }
 }
 
 
@@ -27,7 +27,7 @@ Bool directoryExists(const CString& filename)
 {
 {
 	DWORD dwAttrib = GetFileAttributes(filename.get());
 	DWORD dwAttrib = GetFileAttributes(filename.get());
 
 
-	return dwAttrib != INVALID_FILE_ATTRIBUTES 
+	return dwAttrib != INVALID_FILE_ATTRIBUTES
 		&& (dwAttrib & FILE_ATTRIBUTE_DIRECTORY);
 		&& (dwAttrib & FILE_ATTRIBUTE_DIRECTORY);
 }
 }
 
 
@@ -41,7 +41,7 @@ Error removeDirectory(const CString& dirname)
 	fileOperation.fFlags = FOF_NO_UI | FOF_NOCONFIRMATION;
 	fileOperation.fFlags = FOF_NO_UI | FOF_NOCONFIRMATION;
 
 
 	I result = SHFileOperationA(&fileOperation);
 	I result = SHFileOperationA(&fileOperation);
-	if(result != 0) 
+	if(result != 0)
 	{
 	{
 		ANKI_LOGE("Could not delete directory %s", dirname.get());
 		ANKI_LOGE("Could not delete directory %s", dirname.get());
 		err = ErrorCode::FUNCTION_FAILED;
 		err = ErrorCode::FUNCTION_FAILED;
@@ -64,7 +64,7 @@ Error createDirectory(const CString& dir)
 }
 }
 
 
 //==============================================================================
 //==============================================================================
-Error getHomeDirectory(HeapAllocator<U8>& alloc, String& out)
+Error getHomeDirectory(GenericMemoryPoolAllocator<U8> alloc, String& out)
 {
 {
 	const char* homed = getenv("HOMEDRIVE");
 	const char* homed = getenv("HOMEDRIVE");
 	const char* homep = getenv("HOMEPATH");
 	const char* homep = getenv("HOMEPATH");
@@ -75,20 +75,18 @@ Error getHomeDirectory(HeapAllocator<U8>& alloc, String& out)
 		return ErrorCode::FUNCTION_FAILED;
 		return ErrorCode::FUNCTION_FAILED;
 	}
 	}
 
 
-	Error err = out.sprintf(alloc, "%s/%s", homed, homep);
-	if(!err)
+	out.sprintf(alloc, "%s/%s", homed, homep);
+
+	// Convert to Unix path
+	for(char& c : out)
 	{
 	{
-		// Convert to Unix path
-		for(char& c : out)
+		if(c == '\\')
 		{
 		{
-			if(c == '\\')
-			{
-				c = '/';
-			}
+			c = '/';
 		}
 		}
 	}
 	}
 
 
-	return err;
+	return ErrorCode::NONE;
 }
 }
 
 
 } // end namespace anki
 } // end namespace anki

+ 1 - 1
thirdparty

@@ -1 +1 @@
-Subproject commit 4044ce0f0b177bb9c66fa3f32cfb00e4a8d15120
+Subproject commit e127f60dd2e58fd88b4bc66b8e2fd6577ba72bb1