X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=products%2Fcompil_scripts%2Ffreeimage.bat;h=9c846ca7f3830c7903b17ff4c81d3a278976634f;hb=fccbf500894ce1b9dcdfc808850712cda1f461d1;hp=61f179971fc6c59c8b675f64d1b5c09c4b490bd8;hpb=58492c1312c21b0210f85f9828a255622d4519dc;p=tools%2Fsat_salome.git

diff --git a/products/compil_scripts/freeimage.bat b/products/compil_scripts/freeimage.bat
index 61f1799..9c846ca 100644
--- a/products/compil_scripts/freeimage.bat
+++ b/products/compil_scripts/freeimage.bat
@@ -14,6 +14,11 @@ if %SAT_DEBUG% == 1 (
   set PRODUCT_BUILD_TYPE=Debug
 )
 
+set PLATFORM_TARGET=x64
+if "%SALOME_APPLICATION_NAME%" == "URANIE" (
+  set PLATFORM_TARGET=Win32
+)
+
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
 if NOT exist "%PRODUCT_INSTALL%\include" mkdir %PRODUCT_INSTALL%\include
 if NOT exist "%PRODUCT_INSTALL%\lib" mkdir %PRODUCT_INSTALL%\lib
@@ -43,8 +48,8 @@ if NOT %ERRORLEVEL% == 0 (
 
 REM Compilation
 echo.
-echo *** %BUILD_DIR%\FreeImage.2017.sln /t:build /p:Configuration=%PRODUCT_BUILD_TYPE%;Platform=x64 
-msbuild %BUILD_DIR%\FreeImage.2017.sln /t:build /p:Configuration=%PRODUCT_BUILD_TYPE%;Platform=x64
+echo *** %BUILD_DIR%\FreeImage.2017.sln /t:build /p:Configuration=%PRODUCT_BUILD_TYPE%;Platform=%PLATFORM_TARGET%
+msbuild %BUILD_DIR%\FreeImage.2017.sln /t:build /p:Configuration=%PRODUCT_BUILD_TYPE%;Platform=%PLATFORM_TARGET%
 if NOT %ERRORLEVEL% == 0 (
     echo ERROR on msbuild
     exit 2
@@ -55,19 +60,25 @@ echo.
 echo *** COPY FreeImage DLL to %PRODUCT_INSTALL%
 
 if %SAT_DEBUG% == 1 (
-  copy /Y %BUILD_DIR%\Dist\x64\*.dll %PRODUCT_INSTALL%\bin\
-  copy /Y %BUILD_DIR%\Dist\x64\*.lib %PRODUCT_INSTALL%\lib\
-  copy /Y %BUILD_DIR%\Dist\x64\*.h %PRODUCT_INSTALL%\include\
-  copy /Y %BUILD_DIR%\Wrapper\FreeImagePlus\dist\x64\*.dll %PRODUCT_INSTALL%\bin\
-  copy /Y %BUILD_DIR%\Wrapper\FreeImagePlus\dist\x64\*.lib %PRODUCT_INSTALL%\lib\
-  copy /Y %BUILD_DIR%\Wrapper\FreeImagePlus\dist\x64\*.h %PRODUCT_INSTALL%\include\
+  copy /Y %BUILD_DIR%\Dist\%PLATFORM_TARGET%\*.dll %PRODUCT_INSTALL%\bin\
+  copy /Y %BUILD_DIR%\Dist\%PLATFORM_TARGET%\*.lib %PRODUCT_INSTALL%\lib\
+  copy /Y %BUILD_DIR%\Dist\%PLATFORM_TARGET%\*.pdb %PRODUCT_INSTALL%\lib\
+  copy /Y %BUILD_DIR%\Dist\%PLATFORM_TARGET%\*.h %PRODUCT_INSTALL%\include\
+  copy /Y %BUILD_DIR%\Wrapper\FreeImagePlus\dist\%PLATFORM_TARGET%\*.dll %PRODUCT_INSTALL%\bin\
+  copy /Y %BUILD_DIR%\Wrapper\FreeImagePlus\dist\%PLATFORM_TARGET%\*.lib %PRODUCT_INSTALL%\lib\
+  copy /Y %BUILD_DIR%\Wrapper\FreeImagePlus\dist\%PLATFORM_TARGET%\*.pdb %PRODUCT_INSTALL%\lib\
+  copy /Y %BUILD_DIR%\Wrapper\FreeImagePlus\dist\%PLATFORM_TARGET%\*.h %PRODUCT_INSTALL%\include\
+  copy /Y %BUILD_DIR%\Wrapper\FreeImagePlus\dist\%PLATFORM_TARGET%\FreeImagePlusd.dll %PRODUCT_INSTALL%\bin\FreeImagePlus.dll
+  copy /Y %BUILD_DIR%\Wrapper\FreeImagePlus\dist\%PLATFORM_TARGET%\FreeImagePlusd.lib %PRODUCT_INSTALL%\lib\FreeImagePlus.lib
+  copy /Y %BUILD_DIR%\Dist\%PLATFORM_TARGET%\FreeImaged.dll %PRODUCT_INSTALL%\bin\FreeImage.dll
+  copy /Y %BUILD_DIR%\Dist\%PLATFORM_TARGET%\FreeImaged.lib %PRODUCT_INSTALL%\lib\FreeImage.lib
 ) else (
-  copy /Y %BUILD_DIR%\Dist\x64\FreeImage.dll %PRODUCT_INSTALL%\bin\FreeImage.dll
-  copy /Y %BUILD_DIR%\Dist\x64\FreeImage.lib %PRODUCT_INSTALL%\lib\FreeImage.lib
-  copy /Y %BUILD_DIR%\Dist\x64\FreeImage.h %PRODUCT_INSTALL%\include\FreeImage.h
-  copy /Y %BUILD_DIR%\Wrapper\FreeImagePlus\dist\x64\FreeImagePlus.dll %PRODUCT_INSTALL%\bin\FreeImagePlus.dll
-  copy /Y %BUILD_DIR%\Wrapper\FreeImagePlus\dist\x64\FreeImagePlus.lib %PRODUCT_INSTALL%\lib\FreeImagePlus.lib
-  copy /Y %BUILD_DIR%\Wrapper\FreeImagePlus\dist\x64\FreeImagePlus.h %PRODUCT_INSTALL%\include\FreeImagePlus.h
+  copy /Y %BUILD_DIR%\Dist\%PLATFORM_TARGET%\FreeImage.dll %PRODUCT_INSTALL%\bin\FreeImage.dll
+  copy /Y %BUILD_DIR%\Dist\%PLATFORM_TARGET%\FreeImage.lib %PRODUCT_INSTALL%\lib\FreeImage.lib
+  copy /Y %BUILD_DIR%\Dist\%PLATFORM_TARGET%\FreeImage.h %PRODUCT_INSTALL%\include\FreeImage.h
+  copy /Y %BUILD_DIR%\Wrapper\FreeImagePlus\dist\%PLATFORM_TARGET%\FreeImagePlus.dll %PRODUCT_INSTALL%\bin\FreeImagePlus.dll
+  copy /Y %BUILD_DIR%\Wrapper\FreeImagePlus\dist\%PLATFORM_TARGET%\FreeImagePlus.lib %PRODUCT_INSTALL%\lib\FreeImagePlus.lib
+  copy /Y %BUILD_DIR%\Wrapper\FreeImagePlus\dist\%PLATFORM_TARGET%\FreeImagePlus.h %PRODUCT_INSTALL%\include\FreeImagePlus.h
 )
 
 taskkill /F /IM "mspdbsrv.exe"