diff options
| author | montellese <montellese@xbmc.org> | 2014-07-12 16:44:57 +0200 |
|---|---|---|
| committer | montellese <montellese@xbmc.org> | 2014-07-30 11:15:59 +0200 |
| commit | afdf5605de3c5fd63f20130fc692364234513ea3 (patch) | |
| tree | 5e92af4df1fc669e016fe2ffb2d1fac8cbb446cc /tools/buildsteps | |
| parent | 83d9abf8a8a16ec8ba1188f737109f1f973527f7 (diff) | |
[win32] cmake: integrated xbmc-addons-depends-windows into xbmc-addons-depends buildsystem
Diffstat (limited to 'tools/buildsteps')
| -rw-r--r-- | tools/buildsteps/win32/make-addon-depends.bat | 7 | ||||
| -rw-r--r-- | tools/buildsteps/win32/make-addons.bat | 11 |
2 files changed, 5 insertions, 13 deletions
diff --git a/tools/buildsteps/win32/make-addon-depends.bat b/tools/buildsteps/win32/make-addon-depends.bat index e1c3fdab5e..2ec58bfb96 100644 --- a/tools/buildsteps/win32/make-addon-depends.bat +++ b/tools/buildsteps/win32/make-addon-depends.bat @@ -31,7 +31,7 @@ SET CUR_PATH=%CD% SET BASE_PATH=%WORKDIR%\project\cmake\ SET ADDONS_PATH=%BASE_PATH%\addons SET ADDONS_OUTPUT_PATH=%ADDONS_PATH%\output -SET ADDON_DEPENDS_PATH=%ADDONS_PATH%\depends\win32 +SET ADDON_DEPENDS_PATH=%ADDONS_PATH%\depends SET ADDON_DEPENDS_BUILD_PATH=%ADDON_DEPENDS_PATH%\build SET ERRORFILE=%BASE_PATH%\make-addon-depends.error @@ -60,7 +60,10 @@ CD "%ADDON_DEPENDS_BUILD_PATH%" rem execute cmake to generate makefiles processable by nmake cmake "%ADDON_DEPENDS_PATH%" -G "NMake Makefiles" ^ -DCMAKE_BUILD_TYPE=Release ^ - -DCMAKE_INSTALL_PREFIX=%ADDONS_OUTPUT_PATH% + -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" ^ ^ + -DCMAKE_INSTALL_PREFIX=%ADDONS_OUTPUT_PATH% ^ + -DARCH_DEFINES="-DTARGET_WINDOWS -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS -D_USE_32BIT_TIME_T -D_WINSOCKAPI_" IF ERRORLEVEL 1 ( ECHO cmake error level: %ERRORLEVEL% > %ERRORFILE% GOTO ERROR diff --git a/tools/buildsteps/win32/make-addons.bat b/tools/buildsteps/win32/make-addons.bat index 10a2a8bc4d..02283d03b3 100644 --- a/tools/buildsteps/win32/make-addons.bat +++ b/tools/buildsteps/win32/make-addons.bat @@ -40,9 +40,6 @@ SET ADDONS_BUILD_PATH=%ADDONS_PATH%\build SET ERRORFILE=%BASE_PATH%\make-addons.error -SET XBMC_INCLUDE_PATH=%ADDON_DEPENDS_PATH%\include\xbmc -SET XBMC_LIB_PATH=%ADDON_DEPENDS_PATH%\lib\xbmc - rem determine whether make-addon-depends.bat should be called with noclean or not SET addon_depends_mode=clean IF %noclean% == true ( @@ -70,14 +67,6 @@ IF %noclean% == false ( ) ) -rem make sure the xbmc include and library paths exist -IF NOT EXIST "%XBMC_INCLUDE_PATH%" ( - MKDIR "%XBMC_INCLUDE_PATH%" -) -IF NOT EXIST "%XBMC_LIB_PATH%" ( - MKDIR "%XBMC_LIB_PATH%" -) - rem create the build directory IF NOT EXIST "%ADDONS_BUILD_PATH%" MKDIR "%ADDONS_BUILD_PATH%" |