sync with 3dstool

Author: dnasdw

CMakeLists.txt

@@ -66,7 +66,9 @@ if(WIN32)
 endif()
 if(UNIX OR MINGW)
   add_definitions(-D_FILE_OFFSET_BITS=64)
-  if(NOT APPLE)
+  if(APPLE)
+    add_definitions(-Wno-shift-overflow)
+  else()
     add_definitions(-Wno-multichar -Wno-unused-result)
   endif()
   set(CMAKE_INSTALL_RPATH .)

cmake/AutoFiles.cmake

@@ -26,8 +26,8 @@ function(AUTO_FILES FOLDER FILTER PATTERN)
   string(REPLACE "./" "" AUTO_FILES_FILTER "${AUTO_FILES_FILTER}")
   string(REPLACE "/" "\\" AUTO_FILES_FILTER "${AUTO_FILES_FILTER}")
   string(REPLACE "..\\" "../" AUTO_FILES_FILTER "${AUTO_FILES_FILTER}")
-  if("${AUTO_FILES_FILTER}" STREQUAL "../")
-    set(AUTO_FILES_FILTER "..")
+  if("${AUTO_FILES_FILTER}" MATCHES "(.+)/$")
+    set(AUTO_FILES_FILTER "${CMAKE_MATCH_1}")
   endif()
   if("${AUTO_FILES_FILTER}" STREQUAL ".")
     source_group("${FILTER}" FILES ${AUTO_FILES_FOLDER_FILES})

src/utility.cpp

@@ -95,45 +95,45 @@ int main(int argc, char* argv[])
 const UString& UGetModuleFileName()
 {
 	const u32 uMaxPath = 4096;
-	static UString sFileName;
-	if (!sFileName.empty())
+	static UString c_sFileName;
+	if (!c_sFileName.empty())
 	{
-		return sFileName;
+		return c_sFileName;
 	}
-	sFileName.resize(uMaxPath, USTR('\0'));
+	c_sFileName.resize(uMaxPath, USTR('\0'));
 	u32 uSize = 0;
 #if SDW_PLATFORM == SDW_PLATFORM_WINDOWS
-	uSize = GetModuleFileNameW(nullptr, &*sFileName.begin(), uMaxPath);
+	uSize = GetModuleFileNameW(nullptr, &*c_sFileName.begin(), uMaxPath);
 #elif SDW_PLATFORM == SDW_PLATFORM_MACOS
 	char szPath[uMaxPath] = {};
 	u32 uPathSize = uMaxPath;
 	if (_NSGetExecutablePath(szPath, &uPathSize) != 0)
 	{
-		sFileName.clear();
+		c_sFileName.clear();
 		printf("ERROR: _NSGetExecutablePath error\n\n");
 	}
-	else if (realpath(szPath, &*sFileName.begin()) == nullptr)
+	else if (realpath(szPath, &*c_sFileName.begin()) == nullptr)
 	{
-		sFileName.clear();
+		c_sFileName.clear();
 		printf("ERROR: realpath error\n\n");
 	}
-	uSize = strlen(sFileName.c_str());
+	uSize = strlen(c_sFileName.c_str());
 #elif SDW_PLATFORM == SDW_PLATFORM_LINUX || SDW_PLATFORM == SDW_PLATFORM_CYGWIN
-	ssize_t nCount = readlink("/proc/self/exe", &*sFileName.begin(), uMaxPath);
+	ssize_t nCount = readlink("/proc/self/exe", &*c_sFileName.begin(), uMaxPath);
 	if (nCount == -1)
 	{
-		sFileName.clear();
+		c_sFileName.clear();
 		printf("ERROR: readlink /proc/self/exe error\n\n");
 	}
 	else
 	{
-		sFileName[nCount] = '\0';
+		c_sFileName[nCount] = '\0';
 	}
-	uSize = strlen(sFileName.c_str());
+	uSize = strlen(c_sFileName.c_str());
 #endif
-	sFileName.erase(uSize);
-	sFileName = Replace(sFileName, USTR('\\'), USTR('/'));
-	return sFileName;
+	c_sFileName.erase(uSize);
+	c_sFileName = Replace(c_sFileName, USTR('\\'), USTR('/'));
+	return c_sFileName;
 }
 
 void SetLocale()

src/utility.h

@@ -155,7 +155,7 @@ typedef string UString;
 
 #define SDW_BIT64(n) (UINT64_C(1) << (n))
 
-#define SDW_CONVERT_ENDIAN32(n) (((n) >> 24 & 0xFF) | ((n) >> 8 & 0xFF00) | (((n) & 0xFF00) << 8) | (((n) & 0xFF) << 24))
+#define SDW_CONVERT_ENDIAN32(n) (((n) >> 24 & 0xFF) | ((n) >> 8 & 0xFF00) | ((n) << 8 & 0xFF0000) | ((n) << 24 & 0xFF000000))
 
 #if SDW_PLATFORM == SDW_PLATFORM_WINDOWS
 #define Chsize _chsize_s
@@ -216,19 +216,19 @@ TDest TSToS(const TSrc& a_sString, const string& a_sSrcType, const string& a_sDe
 		return sConverted;
 	}
 	size_t uStringLeft = a_sString.size() * sizeof(typename TSrc::value_type);
-	static const n32 c_nBufferSize = 1024;
-	static const n32 c_nConvertBufferSize = c_nBufferSize - 4;
+	static const int c_nBufferSize = 1024;
+	static const int c_nConvertBufferSize = c_nBufferSize - 4;
 	char szBuffer[c_nBufferSize];
 	typename TSrc::value_type* pString = const_cast<typename TSrc::value_type*>(a_sString.c_str());
 	do
 	{
 		char* pBuffer = szBuffer;
 		size_t uBufferLeft = c_nConvertBufferSize;
-		n32 nError = iconv(cd, reinterpret_cast<char**>(&pString), &uStringLeft, &pBuffer, &uBufferLeft);
+		int nError = static_cast<int>(iconv(cd, reinterpret_cast<char**>(&pString), &uStringLeft, &pBuffer, &uBufferLeft));
 #if SDW_PLATFORM == SDW_PLATFORM_MACOS
-		if (nError >= 0 || (nError == static_cast<size_t>(-1) && errno == E2BIG))
+		if (nError >= 0 || (nError == -1 && errno == E2BIG))
 #else
-		if (nError == 0 || (nError == static_cast<size_t>(-1) && errno == E2BIG))
+		if (nError == 0 || (nError == -1 && errno == E2BIG))
 #endif
 		{
 			*reinterpret_cast<typename TDest::value_type*>(szBuffer + c_nConvertBufferSize - uBufferLeft) = 0;