set PRODUCT_BUILD_TYPE=Debug\r
)\r
\r
+set PLATFORM_TARGET=x64\r
+if "%SALOME_APPLICATION_NAME%" == "URANIE" (\r
+ set PLATFORM_TARGET=Win32\r
+)\r
+\r
if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%\r
\r
REM clean BUILD directory\r
set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE%\r
set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_SHARED_LIBS=ON\r
set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE\r
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64"\r
+if %PLATFORM_TARGET% == Win32 (\r
+ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A Win32 -Thost=x64 -DCMAKE_SYSTEM_VERSION=10.0.19041.0\r
+)\r
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR:STRING=%CMAKE_GENERATOR%\r
+\r
set MSBUILDDISABLENODEREUSE=1\r
\r
echo.\r
\r
echo.\r
echo *********************************************************************\r
-echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% ALL_BUILD.vcxproj\r
+echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:PlatformTarget=%PLATFORM_TARGET% ALL_BUILD.vcxproj\r
echo *********************************************************************\r
echo.\r
\r
-msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% ALL_BUILD.vcxproj\r
+msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:PlatformTarget=%PLATFORM_TARGET% ALL_BUILD.vcxproj\r
if NOT %ERRORLEVEL% == 0 (\r
echo ERROR on msbuild ALL_BUILD.vcxproj\r
exit 2\r
\r
echo.\r
echo *********************************************************************\r
-echo *** installation... msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% INSTALL.vcxproj\r
+echo *** installation... msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:PlatformTarget=%PLATFORM_TARGET% INSTALL.vcxproj\r
echo *********************************************************************\r
echo.\r
\r
-msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% INSTALL.vcxproj\r
+msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:PlatformTarget=%PLATFORM_TARGET% INSTALL.vcxproj\r
if NOT %ERRORLEVEL% == 0 (\r
echo ERROR on msbuild INSTALL.vcxproj\r
exit 3\r
if %SAT_DEBUG% == 0 (\r
copy /Y %BUILD_DIR%\%PRODUCT_BUILD_TYPE%\Freetype.dll %PRODUCT_INSTALL%\bin\Freetype.dll\r
) else (\r
+ copy /Y %BUILD_DIR%\%PRODUCT_BUILD_TYPE%\*.lib %PRODUCT_INSTALL%\lib\\r
copy /Y %BUILD_DIR%\%PRODUCT_BUILD_TYPE%\*.dll %PRODUCT_INSTALL%\bin\\r
+ copy /Y %BUILD_DIR%\%PRODUCT_BUILD_TYPE%\Freetyped.dll %PRODUCT_INSTALL%\bin\Freetype.dll\r
+ copy /Y %BUILD_DIR%\%PRODUCT_BUILD_TYPE%\Freetyped.lib %PRODUCT_INSTALL%\lib\Freetype.lib\r
)\r
if NOT %ERRORLEVEL% == 0 (\r
echo ERROR when copying Freetype DLL\r