X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2265a2d51e3338353aeaa56f8d7521d7993342f7..f284605f65f6f957c90452b574f4131079819b53:/contrib/build/plot/makefile.bcc

diff --git a/contrib/build/plot/makefile.bcc b/contrib/build/plot/makefile.bcc
index 58817cc8bd..9ed5120109 100644
--- a/contrib/build/plot/makefile.bcc
+++ b/contrib/build/plot/makefile.bcc
@@ -20,36 +20,35 @@ BCCDIR = $(MAKEDIR)\..
 
 ### Variables: ###
 
-LIBDIRNAME = \
-	..\..\src\plot\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = \
 	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 PLOTDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I..\..\src\plot\..\..\..\include -I$(LIBDIRNAME) \
-	-I..\..\src\plot\..\..\..\src\tiff -I..\..\src\plot\..\..\..\src\jpeg \
-	-I..\..\src\plot\..\..\..\src\png -I..\..\src\plot\..\..\..\src\zlib \
-	-I..\..\src\plot\..\..\..\src\regex \
-	-I..\..\src\plot\..\..\..\src\expat\lib -I..\..\src\plot\..\..\include \
-	-DWXUSINGDLL -DWXMAKINGDLL_PLOT $(CXXFLAGS) -Hu \
-	-H=$(OBJS)\wxprec_plotdll.csm
+	$(__UNICODE_DEFINE_p) -I..\..\src\plot\..\..\..\include -I$(SETUPHDIR) \
+	-I..\..\src\plot\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_PLOT $(CXXFLAGS) \
+	-Hu -H=$(OBJS)\wxprec_plotdll.csm
 PLOTDLL_OBJECTS =  \
 	$(OBJS)\plotdll_dummy.obj \
 	$(OBJS)\plotdll_plot.obj
 PLOTLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I..\..\src\plot\..\..\..\include -I$(LIBDIRNAME) \
-	-I..\..\src\plot\..\..\..\src\tiff -I..\..\src\plot\..\..\..\src\jpeg \
-	-I..\..\src\plot\..\..\..\src\png -I..\..\src\plot\..\..\..\src\zlib \
-	-I..\..\src\plot\..\..\..\src\regex \
-	-I..\..\src\plot\..\..\..\src\expat\lib -I..\..\src\plot\..\..\include \
-	$(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_plotlib.csm
+	$(__UNICODE_DEFINE_p) -I..\..\src\plot\..\..\..\include -I$(SETUPHDIR) \
+	-I..\..\src\plot\..\..\include $(CXXFLAGS) -Hu \
+	-H=$(OBJS)\wxprec_plotlib.csm
 PLOTLIB_OBJECTS =  \
 	$(OBJS)\plotlib_dummy.obj \
 	$(OBJS)\plotlib_plot.obj
+SETUPHDIR = \
+	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 
 ### Conditionally set variables: ###
 
+!if "$(SHARED)" == "0"
+LIBDIRNAME = ..\..\src\plot\..\..\..\lib\bcc_lib$(CFG)
+!endif
+!if "$(SHARED)" == "1"
+LIBDIRNAME = ..\..\src\plot\..\..\..\lib\bcc_dll$(CFG)
+!endif
 !if "$(USE_GUI)" == "0"
 PORTNAME = base
 !endif
@@ -180,7 +179,7 @@ clean:
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib
 
 !if "$(SHARED)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_bcc$(VENDORTAG).dll: $(PLOTDLL_OBJECTS) $(OBJS)\plotdll_dummy.obj
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_bcc$(VENDORTAG).dll: $(OBJS)\plotdll_dummy.obj  $(PLOTDLL_OBJECTS)
 	ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
 	c0d32.obj $(PLOTDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
 |
@@ -188,7 +187,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_b
 !endif
 
 !if "$(SHARED)" == "0"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib: $(PLOTLIB_OBJECTS) $(OBJS)\plotlib_dummy.obj
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib: $(OBJS)\plotlib_dummy.obj  $(PLOTLIB_OBJECTS)
 	if exist $@ del $@
 	tlib /a /p2048 $@ @&&|
 	$(PLOTLIB_OBJECTS)