X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec08d395bd37d7446787f5539b40a8ed5283654c..d890ea0d4ce6fadf640cbff97ef27c75330c3083:/utils/wxrc/makefile.bcc

diff --git a/utils/wxrc/makefile.bcc b/utils/wxrc/makefile.bcc
index 12e286b489..5fcb532cf7 100644
--- a/utils/wxrc/makefile.bcc
+++ b/utils/wxrc/makefile.bcc
@@ -4,7 +4,12 @@
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
+.autodepend
+
 !ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
 BCCDIR = $(MAKEDIR)\..
 !endif
 
@@ -14,20 +19,16 @@ BCCDIR = $(MAKEDIR)\..
 # Do not modify the rest of this file!
 # -------------------------------------------------------------------------
 
-!if "$(BCCDIR)" == "\.."
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
-!endif
-
 ### Variables: ###
 
 OBJS = \
 	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 SETUPHDIR = \
 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-WXRC_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \
-	$(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+WXRC_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \
+	$(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \
-	-I$(SETUPHDIR) -I. $(__DLLFLAG_p) $(CXXFLAGS)
+	-I$(SETUPHDIR) -I. $(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS)
 WXRC_OBJECTS =  \
 	$(OBJS)\wxrc_wxrc.obj
 
@@ -151,6 +152,6 @@ clean:
 	-if exist $(OBJS)\wxrc.ils del $(OBJS)\wxrc.ils
 
 $(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
-	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap @&&|
+	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap @&&|
 	c0x32.obj $(WXRC_OBJECTS),$@,, $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib  import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
 |