rename the platform macro

alexchicn · alexchicn · commit 373f1113e193 · 2018-01-29T19:10:34.000+08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,16 +9,16 @@ project(libgltf)
 set(CMAKE_DEBUG_POSTFIX "d")
 
 # define the platform
-set(PLATFORM_WINDOWS FALSE)
-set(PLATFORM_LINUX FALSE)
-set(PLATFORM_MACOS FALSE)
+set(LIBGLTF_PLATFORM_WINDOWS FALSE)
+set(LIBGLTF_PLATFORM_LINUX FALSE)
+set(LIBGLTF_PLATFORM_MACOS FALSE)
 
 option(LIBGLTF_COVERAGE_GCOV "Coverage gcov (debug, Linux builds only)" OFF)
 option(LIBGLTF_BUILD_DEBUG_FOR_UE4 "Build for UE4" OFF)
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    set(PLATFORM_WINDOWS TRUE)
-    add_definitions(-DPLATFORM_WINDOWS)
+    set(LIBGLTF_PLATFORM_WINDOWS TRUE)
+    add_definitions(-DLIBGLTF_PLATFORM_WINDOWS)
     set(DYNAMIC_LIBRARY_EXTENSION ".dll")
     set(STATIC_LIBRARY_EXTENSION ".lib")
     if(LIBGLTF_BUILD_DEBUG_FOR_UE4)
@@ -32,8 +32,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
         set(PLATFORM_NAME "win64")
     endif()
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    set(PLATFORM_LINUX TRUE)
-    add_definitions(-DPLATFORM_LINUX)
+    set(LIBGLTF_PLATFORM_LINUX TRUE)
+    add_definitions(-DLIBGLTF_PLATFORM_LINUX)
     set(DYNAMIC_LIBRARY_EXTENSION ".so")
     set(STATIC_LIBRARY_EXTENSION ".a")
     set(PLATFORM_NAME "linux")
@@ -48,8 +48,8 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
         add_definitions(-DBUILD_COVERALLS)
     endif()
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    set(PLATFORM_MACOS TRUE)
-    add_definitions(-DPLATFORM_MACOS)
+    set(LIBGLTF_PLATFORM_MACOS TRUE)
+    add_definitions(-DLIBGLTF_PLATFORM_MACOS)
     set(DYNAMIC_LIBRARY_EXTENSION ".dylib")
     set(STATIC_LIBRARY_EXTENSION ".a")
     set(PLATFORM_NAME "macos")
@@ -59,7 +59,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     set(CMAKE_SHARED_LIBRARY_PREFIX "")
 endif()
 
-if((NOT ${PLATFORM_WINDOWS}) AND (NOT ${PLATFORM_LINUX}) AND (NOT ${PLATFORM_MACOS}))
+if((NOT ${LIBGLTF_PLATFORM_WINDOWS}) AND (NOT ${LIBGLTF_PLATFORM_LINUX}) AND (NOT ${LIBGLTF_PLATFORM_MACOS}))
     message(FATAL_ERROR "Sorry, don't support your system ${CMAKE_SYSTEM_NAME}!")
 endif()
 
@@ -82,12 +82,12 @@ if((CMAKE_COMPILER_IS_GNUCC STREQUAL "1") OR (CMAKE_COMPILER_IS_GNUCXX STREQUAL
     add_definitions(-DCOMPILER_IS_GCC)
 endif()
 
-if(${PLATFORM_WINDOWS})
+if(${LIBGLTF_PLATFORM_WINDOWS})
     add_definitions(-DUNICODE -D_UNICODE)
 endif()
 
-if(LIBGLTF_BUILD_GCOV AND PLATFORM_LINUX)
-  if(PLATFORM_LINUX)
+if(LIBGLTF_BUILD_GCOV AND LIBGLTF_PLATFORM_LINUX)
+  if(LIBGLTF_PLATFORM_LINUX)
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage")
     set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage")
     set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage -lgcov -lstdc++fs")
diff --git a/include/libgltf/libgltf.h b/include/libgltf/libgltf.h
@@ -8,13 +8,13 @@
 
 namespace libgltf
 {
-#if defined(PLATFORM_WINDOWS)
+#if defined(LIBGLTF_PLATFORM_WINDOWS)
 #   if defined(UNICODE)
     typedef std::wstring                                        GLTFString;
 #   else
     typedef std::string                                         GLTFString;
 #   endif
-#elif defined(PLATFORM_LINUX) || defined(PLATFORM_MACOS) || defined(PLATFORM_ANDROID) || defined(PLATFORM_IOS)
+#elif defined(LIBGLTF_PLATFORM_LINUX) || defined(LIBGLTF_PLATFORM_MACOS) || defined(PLATFORM_ANDROID) || defined(PLATFORM_IOS)
     typedef std::string                                         GLTFString;
 #else
 #error Sorry, not support your platform.
diff --git a/source/libgltf/CMakeLists.txt b/source/libgltf/CMakeLists.txt
@@ -39,7 +39,7 @@ add_library(libgltf STATIC
     ${SOURCE_FILE_LIST}
     )
 
-if(${PLATFORM_WINDOWS})
+if(${LIBGLTF_PLATFORM_WINDOWS})
     add_custom_command(TARGET libgltf
         POST_BUILD
         COMMAND xcopy ARGS "/D /S /Y \"${ROOT_PATH}/include\" \"${OUT_PATH}/include\\\""
diff --git a/source/libgltf/libgltfpch.h b/source/libgltf/libgltfpch.h
@@ -4,7 +4,7 @@
 #include <rapidjson/stringbuffer.h>
 #include <rapidjson/writer.h>
 
-#if defined(PLATFORM_WINDOWS)
+#if defined(LIBGLTF_PLATFORM_WINDOWS)
 #   if defined(UNICODE)
 #       define      GLTFTEXT(t)         L##t
 #   else
@@ -16,7 +16,7 @@
 
 namespace libgltf
 {
-#if defined(PLATFORM_WINDOWS)
+#if defined(LIBGLTF_PLATFORM_WINDOWS)
 #   if defined(UNICODE)
     typedef rapidjson::UTF16<>                                  GLTFCharType;
 #   else
diff --git a/source/runtest/CMakeLists.txt b/source/runtest/CMakeLists.txt
@@ -23,12 +23,12 @@ set(SOURCE_FILE_LIST
 source_group("header" FILES ${HEADER_FILE_LIST})
 source_group("source" FILES ${SOURCE_FILE_LIST})
 
-if(${PLATFORM_WINDOWS})
+if(${LIBGLTF_PLATFORM_WINDOWS})
     set(LIBRARY_PATH_LIST
         debug libgltf${CMAKE_DEBUG_POSTFIX}${STATIC_LIBRARY_EXTENSION}
         optimized libgltf${STATIC_LIBRARY_EXTENSION}
         )
-elseif(${PLATFORM_LINUX} OR ${PLATFORM_MACOS})
+elseif(${LIBGLTF_PLATFORM_LINUX} OR ${LIBGLTF_PLATFORM_MACOS})
     set(LIBRARY_PATH_LIST
         debug gltf${CMAKE_DEBUG_POSTFIX}${STATIC_LIBRARY_EXTENSION}
         optimized gltf${STATIC_LIBRARY_EXTENSION}
diff --git a/source/runtest/runtest.cpp b/source/runtest/runtest.cpp
@@ -5,13 +5,13 @@
 #include <iosfwd>
 #include <string>
 
-#if defined(PLATFORM_WINDOWS)
+#if defined(LIBGLTF_PLATFORM_WINDOWS)
 #include <crtdbg.h>
 #endif
 
 int main(int _iArgc, char* _pcArgv[])
 {
-#if defined(PLATFORM_WINDOWS) && defined(_DEBUG)
+#if defined(LIBGLTF_PLATFORM_WINDOWS) && defined(_DEBUG)
     _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
 #endif
 
@@ -38,7 +38,7 @@ int main(int _iArgc, char* _pcArgv[])
         return error_code;
     }
 
-#if defined(PLATFORM_WINDOWS)
+#if defined(LIBGLTF_PLATFORM_WINDOWS)
     std::wstringstream input_content;
     {
         std::wifstream input_file(input_file_path.c_str(), std::ios::in | std::ios::binary);
@@ -69,7 +69,7 @@ int main(int _iArgc, char* _pcArgv[])
         return error_code;
     }
 
-#if defined(PLATFORM_WINDOWS)
+#if defined(LIBGLTF_PLATFORM_WINDOWS)
     std::wstring output_content;
 #else
     std::string output_content;
diff --git a/tools/jsonschematoc11/jsonschematoc11.py b/tools/jsonschematoc11/jsonschematoc11.py
@@ -86,13 +86,13 @@ def generate(self, codeFileName, outputHeaderPath=None, outputSourcePath=None, n
                 header_file.write(u'{\n')
                 begin_space = u'    '
 
-            header_file.write(u'#if defined(PLATFORM_WINDOWS)\n')
+            header_file.write(u'#if defined(LIBGLTF_PLATFORM_WINDOWS)\n')
             header_file.write(u'#   if defined(UNICODE)\n')
             header_file.write(u'%s%s\n' % (begin_space, u'typedef std::wstring                                        GLTFString;'))
             header_file.write(u'#   else\n')
             header_file.write(u'%s%s\n' % (begin_space, u'typedef std::string                                         GLTFString;'))
             header_file.write(u'#   endif\n')
-            header_file.write(u'#elif defined(PLATFORM_LINUX) || defined(PLATFORM_MACOS) || defined(PLATFORM_ANDROID) || defined(PLATFORM_IOS)\n')
+            header_file.write(u'#elif defined(LIBGLTF_PLATFORM_LINUX) || defined(LIBGLTF_PLATFORM_MACOS) || defined(PLATFORM_ANDROID) || defined(PLATFORM_IOS)\n')
             header_file.write(u'%s%s\n' % (begin_space, u'typedef std::string                                         GLTFString;'))
             header_file.write(u'#else\n')
             header_file.write(u'#error Sorry, not support your platform.\n')

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ add_library(libgltf STATIC`
`39`	`39`	`${SOURCE_FILE_LIST}`
`40`	`40`	`)`
`41`	`41`
`42`		`-if(${PLATFORM_WINDOWS})`
	`42`	`+if(${LIBGLTF_PLATFORM_WINDOWS})`
`43`	`43`	`add_custom_command(TARGET libgltf`
`44`	`44`	`POST_BUILD`
`45`	`45`	`COMMAND xcopy ARGS "/D /S /Y \"${ROOT_PATH}/include\" \"${OUT_PATH}/include\\\""`