Distribution - remove FreeImage and DevIL from distribution scripts

gkv311 · Jan 16, 2025 · a29e5e3 · a29e5e3
1 parent 585edd8
commit a29e5e3
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 21 deletions.
diff --git a/distribution/build.bat b/distribution/build.bat
@@ -9,12 +9,8 @@ set "anFFmpeg="
 set "anNVAPI="
 set "anOpenAL="
 set "anOpenVR="
-set "aFreeImage="
-set "aDevIL="
 set "anMsvcr="
 set USE_OPENVR=ON
-set USE_FREEIMAGE=ON
-set USE_DEVIL=ON
 set USE_MSVCR=ON
 set USE_MONGOOSE=ON
 rem Activate notifications about sView updates available on sview.ru
@@ -165,10 +161,6 @@ cmake -G "Ninja" ^
  -D OPENAL_DIR:PATH="%anOpenAL%" ^
  -D USE_OPENVR:BOOL="%USE_OPENVR%" ^
  -D OPENVR_DIR:PATH="%anOpenVR%" ^
- -D USE_FREEIMAGE:BOOL="%USE_FREEIMAGE%" ^
- -D FREEIMAGE_DIR:PATH="%aFreeImage%" ^
- -D USE_DEVIL:BOOL="%USE_DEVIL%" ^
- -D DEVIL_DIR:PATH="%aDevIL%" ^
  -D USE_MSVCR:BOOL="%USE_MSVCR%" ^
  -D MSVCR_DIR:PATH="%anMsvcr%" ^
  -B "%aWorkDir%" -S "%aSrcRoot%"

diff --git a/distribution/build.iss b/distribution/build.iss
@@ -224,11 +224,6 @@ Source: {#SVIEW_DISTR_PATH}\icons\sView_PNS.ico;      DestDir: {app}\icons;
 Source: {#SVIEW_DISTR_PATH}\demo.jps;                 DestDir: {app};                        Flags: ignoreversion;         Components: StDrawers\StImageViewer
 Source: {#SVIEW_DISTR_PATH}\demo_robot.jps;           DestDir: {app};                        Flags: ignoreversion;         Components: StDrawers\StImageViewer
 Source: {#SVIEW_DISTR_PATH}\StImageViewer.dll;        DestDir: {app};                        Flags: 64bit ignoreversion;   Components: StCore
-; FreeImage library (should be optional)
-Source: {#SVIEW_DISTR_PATH}\FreeImage.dll;            DestDir: {app};                        Flags: 64bit ignoreversion;   Components: StDrawers\StImageViewer
-; DevIL libraries (should be optional)
-Source: {#SVIEW_DISTR_PATH}\DevIL.dll;                DestDir: {app};                        Flags: 64bit ignoreversion;   Components: StDrawers\StImageViewer
-Source: {#SVIEW_DISTR_PATH}\ILU.dll;                  DestDir: {app};                        Flags: 64bit ignoreversion;   Components: StDrawers\StImageViewer
 
 ; StDrawers -> Movie Player
 Source: {#SVIEW_DISTR_PATH}\lang\*StMoviePlayer.lng;  DestDir: {app}\lang;                   Flags: ignoreversion recursesubdirs; Components: StCore

diff --git a/distribution/msvc_build.bat b/distribution/msvc_build.bat
@@ -17,13 +17,9 @@ set "anFFmpeg="
 set "anNVAPI="
 set "anOpenAL="
 set "anOpenVR="
-set "aDevIL="
-set "aFreeImage="
 set "anMsvcr="
 
 set USE_OPENVR=ON
-set USE_FREEIMAGE=OFF
-set USE_DEVIL=OFF
 set USE_MSVCR=OFF
 
 rem Build stages to perform
@@ -135,10 +131,6 @@ if ["%toCMake%"] == ["1"] (
  -D OPENAL_DIR:PATH="%anOpenAL%" ^
  -D USE_OPENVR:BOOL="%USE_OPENVR%" ^
  -D OPENVR_DIR:PATH="%anOpenVR%" ^
- -D USE_FREEIMAGE:BOOL="%USE_FREEIMAGE%" ^
- -D FREEIMAGE_DIR:PATH="%aFreeImage%" ^
- -D USE_DEVIL:BOOL="%USE_DEVIL%" ^
- -D DEVIL_DIR:PATH="%aDevIL%" ^
  -D USE_MSVCR:BOOL="%USE_MSVCR%" ^
  -D MSVCR_DIR:PATH="%anMsvcr%" ^
  -B "%aWorkDir%" -S "%aSrcRoot%"