feat(layout): support windows compliation

Tencent · Jun 21, 2023 · 797b5bb · 797b5bb
1 parent 732b7f0
commit 797b5bb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 19 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,23 +15,24 @@ ENDIF()
 MESSAGE("Taitank Build Platform: " ${TARGET_BUILD_PLATFORM})
 MESSAGE("Using CXX Compiler: " ${CMAKE_CXX_COMPILER})
 
-ADD_COMPILE_OPTIONS(-Os)
 ADD_COMPILE_OPTIONS(-std=c++11)
 
-ADD_COMPILE_OPTIONS(-Werror -Wextra -Wall -Wno-unused-variable -Wno-unused-parameter -Wno-missing-field-initializers)
-ADD_COMPILE_OPTIONS(-fno-rtti -fno-threadsafe-statics)
-ADD_COMPILE_OPTIONS(-fvisibility-inlines-hidden -fvisibility=hidden)
-ADD_COMPILE_OPTIONS(--param=ssp-buffer-size=4)
-ADD_COMPILE_OPTIONS(-fstack-protector)
-ADD_COMPILE_OPTIONS(-fno-exceptions)
-ADD_COMPILE_OPTIONS(-funwind-tables)
-ADD_COMPILE_OPTIONS(-fno-strict-aliasing)
-ADD_COMPILE_OPTIONS(-fPIC)
-ADD_COMPILE_OPTIONS(-ffunction-sections -fdata-sections)
-ADD_COMPILE_OPTIONS(-fno-short-enums)
-ADD_COMPILE_OPTIONS(-pipe)
-ADD_COMPILE_OPTIONS(-Os)
-ADD_COMPILE_OPTIONS(-g)
+if("${CMAKE_SYSTEM_NAME}" NOT STREQUAL "Windows")
+  ADD_COMPILE_OPTIONS(-Werror -Wextra -Wall -Wno-unused-variable -Wno-unused-parameter -Wno-missing-field-initializers)
+  ADD_COMPILE_OPTIONS(-fno-rtti -fno-threadsafe-statics)
+  ADD_COMPILE_OPTIONS(-fvisibility-inlines-hidden -fvisibility=hidden)
+  ADD_COMPILE_OPTIONS(--param=ssp-buffer-size=4)
+  ADD_COMPILE_OPTIONS(-fstack-protector)
+  ADD_COMPILE_OPTIONS(-fno-exceptions)
+  ADD_COMPILE_OPTIONS(-funwind-tables)
+  ADD_COMPILE_OPTIONS(-fno-strict-aliasing)
+  ADD_COMPILE_OPTIONS(-fPIC)
+  ADD_COMPILE_OPTIONS(-ffunction-sections -fdata-sections)
+  ADD_COMPILE_OPTIONS(-fno-short-enums)
+  ADD_COMPILE_OPTIONS(-pipe)
+  ADD_COMPILE_OPTIONS(-Os)
+  ADD_COMPILE_OPTIONS(-g)
+endif()
 
 FILE(GLOB  TAITANK_SROURCE_FILES src/*.cc)
 MESSAGE("BUILD FILES: ${TAITANK_SROURCE_FILES}")

diff --git a/src/taitank_util.h b/src/taitank_util.h
@@ -30,10 +30,7 @@
 
 #include "taitank_flex.h"
 
-// #define __DEBUG__
-// #define LAYOUT_TIME_ANALYZE
 #define ASSERT(e) (assert(e))
-#define nullptr (NULL)
 #define VALUE_AUTO (NAN)
 #define VALUE_UNDEFINED (NAN)
 #define isUndefined(n) (std::isnan(n))

diff --git a/taitank.podspec b/taitank.podspec
@@ -9,7 +9,7 @@
 Pod::Spec.new do |s|
     puts 'taitank.podspec read begins'
     s.name             = 'taitank'
-    s.version          = '1.0.2'
+    s.version          = '1.0.3'
     s.summary          = 'Taitank Cross Platform Layout'
 
   # This description is used to generate tags and improve search results.