fix building holmes and tools

diff --git a/src/flexui/fui_style.pas b/src/flexui/fui_style.pas
index 68ccc34353204b34357d98385bf158e5cde7fdbb..e28aea7cdd8155568c42ea4abce3af20ff0c1ea8 100644 (file)
--- a/src/flexui/fui_style.pas
+++ b/src/flexui/fui_style.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE ../../shared/a_modes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 {.$DEFINE UI_STYLE_DEBUG_SEARCH}
 unit fui_style;
 

diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr
index eb38f0e4eb351e7a34e35a59da36c88a5d97d6bf..69cf03426e052d182a4c420038dc5eee71d30a8f 100644 (file)
--- a/src/game/Doom2DF.lpr
+++ b/src/game/Doom2DF.lpr
@@ -148,7 +148,6 @@ uses
   g_touch in 'sdl2/g_touch.pas',
 {$ENDIF}
 
-  SysUtils,
 {$IFDEF USE_FMOD}
   fmod in '../lib/FMOD/fmod.pas',
   fmoderrors in '../lib/FMOD/fmoderrors.pas',
@@ -181,88 +180,8 @@ uses
   fui_flexlay in '../flexui/fui_flexlay.pas',
   fui_ctls in '../flexui/fui_ctls.pas',
 {$ENDIF}
-
-  ImagingDds in '../lib/vampimg/ImagingDds.pas',
-  ImagingFormats in '../lib/vampimg/ImagingFormats.pas',
-  ImagingPcx in '../lib/vampimg/ImagingPcx.pas',
-  ImagingColors in '../lib/vampimg/ImagingColors.pas',
-  ImagingNetworkGraphics in '../lib/vampimg/ImagingNetworkGraphics.pas',
-//  ImagingComponents in '../lib/vampimg/ImagingComponents.pas',
-  ImagingRadiance in '../lib/vampimg/ImagingRadiance.pas',
-  ImagingPortableMaps in '../lib/vampimg/ImagingPortableMaps.pas',
-  ImagingXpm in '../lib/vampimg/ImagingXpm.pas',
-  ImagingBitmap in '../lib/vampimg/ImagingBitmap.pas',
-  ImagingTypes in '../lib/vampimg/ImagingTypes.pas',
-  Imaging in '../lib/vampimg/Imaging.pas',
-  ImagingExtras in '../lib/vampimg/ImagingExtras.pas',
-  ImagingGif in '../lib/vampimg/ImagingGif.pas',
-  ImagingIO in '../lib/vampimg/ImagingIO.pas',
-  imjdhuff in '../lib/vampimg/JpegLib/imjdhuff.pas',
-  imjdmerge in '../lib/vampimg/JpegLib/imjdmerge.pas',
-  imjdapimin in '../lib/vampimg/JpegLib/imjdapimin.pas',
-  imjidctflt in '../lib/vampimg/JpegLib/imjidctflt.pas',
-  imjdsample in '../lib/vampimg/JpegLib/imjdsample.pas',
-  imjfdctint in '../lib/vampimg/JpegLib/imjfdctint.pas',
-  imjdcoefct in '../lib/vampimg/JpegLib/imjdcoefct.pas',
-  imjdmainct in '../lib/vampimg/JpegLib/imjdmainct.pas',
-  imjcmaster in '../lib/vampimg/JpegLib/imjcmaster.pas',
-  imjdcolor in '../lib/vampimg/JpegLib/imjdcolor.pas',
-  imjcphuff in '../lib/vampimg/JpegLib/imjcphuff.pas',
-  imjidctint in '../lib/vampimg/JpegLib/imjidctint.pas',
-  imjutils in '../lib/vampimg/JpegLib/imjutils.pas',
-  imjdmarker in '../lib/vampimg/JpegLib/imjdmarker.pas',
-  imjdmaster in '../lib/vampimg/JpegLib/imjdmaster.pas',
-  imjmorecfg in '../lib/vampimg/JpegLib/imjmorecfg.pas',
-  imjdct in '../lib/vampimg/JpegLib/imjdct.pas',
-  imjcdctmgr in '../lib/vampimg/JpegLib/imjcdctmgr.pas',
-  imjerror in '../lib/vampimg/JpegLib/imjerror.pas',
-  imjpeglib in '../lib/vampimg/JpegLib/imjpeglib.pas',
-  imjccoefct in '../lib/vampimg/JpegLib/imjccoefct.pas',
-  imjfdctfst in '../lib/vampimg/JpegLib/imjfdctfst.pas',
-  imjchuff in '../lib/vampimg/JpegLib/imjchuff.pas',
-  imjdinput in '../lib/vampimg/JpegLib/imjdinput.pas',
-  imjdapistd in '../lib/vampimg/JpegLib/imjdapistd.pas',
-  imjidctfst in '../lib/vampimg/JpegLib/imjidctfst.pas',
-  imjcsample in '../lib/vampimg/JpegLib/imjcsample.pas',
-  imjmemmgr in '../lib/vampimg/JpegLib/imjmemmgr.pas',
-  imjmemnobs in '../lib/vampimg/JpegLib/imjmemnobs.pas',
-  imjfdctflt in '../lib/vampimg/JpegLib/imjfdctflt.pas',
-  imjcmainct in '../lib/vampimg/JpegLib/imjcmainct.pas',
-  imjcprepct in '../lib/vampimg/JpegLib/imjcprepct.pas',
-  imjidctred in '../lib/vampimg/JpegLib/imjidctred.pas',
-  imjcomapi in '../lib/vampimg/JpegLib/imjcomapi.pas',
-//  imjidctasm in '../lib/vampimg/JpegLib/imjidctasm.pas',
-  imjcapimin in '../lib/vampimg/JpegLib/imjcapimin.pas',
-  imjquant1 in '../lib/vampimg/JpegLib/imjquant1.pas',
-  imjquant2 in '../lib/vampimg/JpegLib/imjquant2.pas',
-  imjcinit in '../lib/vampimg/JpegLib/imjcinit.pas',
-  imjdphuff in '../lib/vampimg/JpegLib/imjdphuff.pas',
-  imjcapistd in '../lib/vampimg/JpegLib/imjcapistd.pas',
-  imjinclude in '../lib/vampimg/JpegLib/imjinclude.pas',
-  imjccolor in '../lib/vampimg/JpegLib/imjccolor.pas',
-  imjcmarker in '../lib/vampimg/JpegLib/imjcmarker.pas',
-  imjcparam in '../lib/vampimg/JpegLib/imjcparam.pas',
-  imjddctmgr in '../lib/vampimg/JpegLib/imjddctmgr.pas',
-  imjdpostct in '../lib/vampimg/JpegLib/imjdpostct.pas',
-  imjdeferr in '../lib/vampimg/JpegLib/imjdeferr.pas',
-  ImagingCanvases in '../lib/vampimg/ImagingCanvases.pas',
-  iminffast in '../lib/vampimg/ZLib/iminffast.pas',
-  imzdeflate in '../lib/vampimg/ZLib/imzdeflate.pas',
-  imtrees in '../lib/vampimg/ZLib/imtrees.pas',
-  dzlib in '../lib/vampimg/ZLib/dzlib.pas',
-  impaszlib in '../lib/vampimg/ZLib/impaszlib.pas',
-  iminfcodes in '../lib/vampimg/ZLib/iminfcodes.pas',
-  iminfblock in '../lib/vampimg/ZLib/iminfblock.pas',
-  imzutil in '../lib/vampimg/ZLib/imzutil.pas',
-  imadler in '../lib/vampimg/ZLib/imadler.pas',
-  imzinflate in '../lib/vampimg/ZLib/imzinflate.pas',
-  iminfutil in '../lib/vampimg/ZLib/iminfutil.pas',
-  iminftrees in '../lib/vampimg/ZLib/iminftrees.pas',
-  ImagingJpeg in '../lib/vampimg/ImagingJpeg.pas',
-  ImagingClasses in '../lib/vampimg/ImagingClasses.pas',
-  ImagingPsd in '../lib/vampimg/ImagingPsd.pas',
-  ImagingTarga in '../lib/vampimg/ImagingTarga.pas',
-  ImagingUtility in '../lib/vampimg/ImagingUtility.pas';
+  {$I ../shared/vampimg.inc}
+  SysUtils;
 
 {$IFDEF WINDOWS}
   {$R *.res}

diff --git a/src/tools/wadcvt.dpr b/src/tools/wadcvt.dpr
index 778f7a6a71edff90ebd478578122412b2fec5bfd..35cce86b12e5a57fee8282cd5f2551cfd5ae8dc4 100644 (file)
--- a/src/tools/wadcvt.dpr
+++ b/src/tools/wadcvt.dpr
@@ -27,6 +27,7 @@ program __wadcvt__;
 uses
   SysUtils,
   Classes,
+  {$I ../shared/vampimg.inc}
   mempool in '../shared/mempool.pas',
   utils in '../shared/utils.pas',
   xstreams in '../shared/xstreams.pas',
@@ -42,8 +43,7 @@ uses
   conbuf in '../shared/conbuf.pas',
   MAPDEF in '../shared/MAPDEF.pas',
   CONFIG in '../shared/CONFIG.pas',
-  e_log in '../engine/e_log.pas',
-  ImagingTypes, Imaging, ImagingUtility;
+  e_log in '../engine/e_log.pas';
 
 
 {.$WARNINGS ON}