ARCHINCDIR must be defined in makeb32.env, not makefile.b32 (patch 548990)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/stc/makefile.b32 b/contrib/src/stc/makefile.b32
index 72a60182abc1a00aa4a719df151a030039eca6da..0ac8176647195cdd0712327ba716ccbcab61d114 100644 (file)
--- a/contrib/src/stc/makefile.b32
+++ b/contrib/src/stc/makefile.b32
@@ -70,6 +70,8 @@ STCCPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(STCCFG)
 
 default: $(STCCFG) $(LIBTARGET)
 
 
 default: $(STCCFG) $(LIBTARGET)
 

+cleancfg: 
+       del $(STCCFG)

 
 {$(S)}.cxx.obj:
        bcc32 $(STCCPPFLAGS) -P -c {$< }
 
 {$(S)}.cxx.obj:
        bcc32 $(STCCPPFLAGS) -P -c {$< }


@@ -91,7 +93,8 @@ $(STCCFG): makefile.b32
 -tWM
 
 -I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm;$(WXDIR)/src/tiff
 -tWM
 
 -I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm;$(WXDIR)/src/tiff

--I$(WXDIR)\include\wx\msw\gnuwin32
+-I$(WXDIR)\include\wx\msw\gnuwin32;$(ARCHINCDIR)
+

 
 -L$(BCCDIR)\lib
 -D__WXWIN__
 
 -L$(BCCDIR)\lib
 -D__WXWIN__

diff --git a/distrib/msw/tmake/b32.t b/distrib/msw/tmake/b32.t
index 33d29f932ee30f5d1e296d61fa7761e683bc15ed..dc6eaa9ba9ed3bb772271b6eec6666d078e7a4d3 100644 (file)
--- a/distrib/msw/tmake/b32.t
+++ b/distrib/msw/tmake/b32.t
@@ -155,8 +155,6 @@ MSWOBJS = #$ ExpandList("WXMSWOBJS");
 HTMLOBJS = #$ ExpandList("WXHTMLOBJS");
 
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 HTMLOBJS = #$ ExpandList("WXHTMLOBJS");
 
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)

-ARCHINCDIR=$(WXDIR)\lib\msw
-ARCHSETUPH=$(ARCHINCDIR)\wx\setup.h

 
 default:       wx
 
 
 default:       wx
 

diff --git a/src/makeb32.env b/src/makeb32.env
index ac8e8f925fd3ec6774538472f1efc97fbd2d0cff..7fb792b653b773888258780270c647e580bf9f53 100644 (file)
--- a/src/makeb32.env
+++ b/src/makeb32.env
@@ -6,6 +6,10 @@ RM= erase
 
 WXDIR = $(WXWIN)
 CFG = $(WXDIR)\src\msw\wxwin32.cfg
 
 WXDIR = $(WXWIN)
 CFG = $(WXDIR)\src\msw\wxwin32.cfg

+
+ARCHINCDIR=$(WXDIR)\lib\msw
+ARCHSETUPH=$(ARCHINCDIR)\wx\setup.h
+

 # Using a config file isn't compatible across all BC++ versions
 # LNKCFG=$(WXDIR)\src\msw\bclnk32.cfg
 WXLIBDIR = $(WXDIR)\lib
 # Using a config file isn't compatible across all BC++ versions
 # LNKCFG=$(WXDIR)\src\msw\bclnk32.cfg
 WXLIBDIR = $(WXDIR)\lib

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index f100d88dd3ea07863e6a4931377aa1dc7184d108..d990bc3129d3099bd533c876ebf95ee0429bd37e 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -377,8 +377,6 @@ HTMLOBJS = $(MSWDIR)\helpctrl.obj \
                $(MSWDIR)\winpars.obj
 
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
                $(MSWDIR)\winpars.obj
 
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)

-ARCHINCDIR=$(WXDIR)\lib\msw
-ARCHSETUPH=$(ARCHINCDIR)\wx\setup.h

 
 default:       wx
 
 
 default:       wx
 

diff --git a/src/stc/makefile.b32 b/src/stc/makefile.b32
index 72a60182abc1a00aa4a719df151a030039eca6da..0ac8176647195cdd0712327ba716ccbcab61d114 100644 (file)
--- a/src/stc/makefile.b32
+++ b/src/stc/makefile.b32
@@ -70,6 +70,8 @@ STCCPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(STCCFG)
 
 default: $(STCCFG) $(LIBTARGET)
 
 
 default: $(STCCFG) $(LIBTARGET)
 

+cleancfg: 
+       del $(STCCFG)

 
 {$(S)}.cxx.obj:
        bcc32 $(STCCPPFLAGS) -P -c {$< }
 
 {$(S)}.cxx.obj:
        bcc32 $(STCCPPFLAGS) -P -c {$< }


@@ -91,7 +93,8 @@ $(STCCFG): makefile.b32
 -tWM
 
 -I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm;$(WXDIR)/src/tiff
 -tWM
 
 -I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm;$(WXDIR)/src/tiff

--I$(WXDIR)\include\wx\msw\gnuwin32
+-I$(WXDIR)\include\wx\msw\gnuwin32;$(ARCHINCDIR)
+

 
 -L$(BCCDIR)\lib
 -D__WXWIN__
 
 -L$(BCCDIR)\lib
 -D__WXWIN__