[win32] add cmake C/CXX compiler flag override files

diff --git a/project/cmake/addons/CMakeLists.txt b/project/cmake/addons/CMakeLists.txt
index f5e276a..548ce14 100644 (file)
--- a/project/cmake/addons/CMakeLists.txt
+++ b/project/cmake/addons/CMakeLists.txt
@@ -42,6 +42,8 @@ list(APPEND CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX})
 set(BUILD_ARGS -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
                -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
                -DCMAKE_BUILD_TYPE=Release
+               -DCMAKE_USER_MAKE_RULES_OVERRIDE=${CMAKE_USER_MAKE_RULES_OVERRIDE}
+               -DCMAKE_USER_MAKE_RULES_OVERRIDE_CXX=${CMAKE_USER_MAKE_RULES_OVERRIDE_CXX}
                -DBUILD_SHARED_LIBS=1)
 
 if(PACKAGE_ZIP)

diff --git a/project/cmake/xbmc-c-flag-overrides.cmake b/project/cmake/xbmc-c-flag-overrides.cmake
new file mode 100644 (file)
index 0000000..ab19701
--- /dev/null
+++ b/project/cmake/xbmc-c-flag-overrides.cmake
@@ -0,0 +1,5 @@
+if(MSVC)
+  set(CMAKE_C_FLAGS "/MP /DWIN32 /D_WINDOWS /W3 /Zi /arch:SSE2")
+  set(CMAKE_C_FLAGS_DEBUG "/D_DEBUG /MDd /Ob0 /Od /RTC1 /D_HAS_ITERATOR_DEBUGGING=0 /D_SECURE_SCL=0")
+  set(CMAKE_C_FLAGS_RELEASE "/MD /Ox /Ob2 /Oi /Ot /Oy /GL /DNDEBUG")
+endif(MSVC)
\ No newline at end of file

diff --git a/project/cmake/xbmc-cxx-flag-overrides.cmake b/project/cmake/xbmc-cxx-flag-overrides.cmake
new file mode 100644 (file)
index 0000000..ad3a090
--- /dev/null
+++ b/project/cmake/xbmc-cxx-flag-overrides.cmake
@@ -0,0 +1,5 @@
+if(MSVC)
+  set(CMAKE_CXX_FLAGS "/MP /DWIN32 /D_WINDOWS /W3 /GR /Zi /EHsc /arch:SSE2")
+  set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /MDd /Ob0 /Od /RTC1 /D_HAS_ITERATOR_DEBUGGING=0 /D_SECURE_SCL=0")
+  set(CMAKE_CXX_FLAGS_RELEASE "/MD /Ox /Ob2 /Oi /Ot /Oy /GL /DNDEBUG")
+endif(MSVC)
\ No newline at end of file

diff --git a/tools/buildsteps/win32/make-addons.bat b/tools/buildsteps/win32/make-addons.bat
index b6bb366..883bc45 100644 (file)
--- a/tools/buildsteps/win32/make-addons.bat
+++ b/tools/buildsteps/win32/make-addons.bat
@@ -65,6 +65,8 @@ CD "%ADDONS_BUILD_PATH%"
 rem execute cmake to generate makefiles processable by nmake
 cmake "%ADDONS_PATH%" -G "NMake Makefiles" ^
       -DCMAKE_BUILD_TYPE=Release ^
+      -DCMAKE_USER_MAKE_RULES_OVERRIDE="%BASE_PATH%/xbmc-c-flag-overrides.cmake" ^
+      -DCMAKE_USER_MAKE_RULES_OVERRIDE_CXX="%BASE_PATH%/xbmc-cxx-flag-overrides.cmake" ^
       -DXBMCROOT=%WORKDIR% ^
       -DDEPENDS_PATH=%ADDON_DEPENDS_PATH% ^
       -DCMAKE_INSTALL_PREFIX=%WORKDIR%\project\Win32BuildSetup\BUILD_WIN32\Xbmc\xbmc-addons ^