AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2002-04-27 10:38:48 +00:00
parent 68c5a31c6c
commit 4deae7a033
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/src/stc/makefile.b32
View File

@ -70,6 +70,8 @@ STCCPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(STCCFG)
default: $(STCCFG) $(LIBTARGET)
cleancfg:
del $(STCCFG)
{$(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
-I$(WXDIR)\include\wx\msw\gnuwin32
-I$(WXDIR)\include\wx\msw\gnuwin32;$(ARCHINCDIR)
-L$(BCCDIR)\lib
-D__WXWIN__

2
distrib/msw/tmake/b32.t
View File

@ -155,8 +155,6 @@ MSWOBJS = #$ ExpandList("WXMSWOBJS");
HTMLOBJS = #$ ExpandList("WXHTMLOBJS");
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
ARCHINCDIR=$(WXDIR)\lib\msw
ARCHSETUPH=$(ARCHINCDIR)\wx\setup.h
default: wx

4
src/makeb32.env
View File

@ -6,6 +6,10 @@ RM= erase
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

2
src/msw/makefile.b32
View File

@ -377,8 +377,6 @@ HTMLOBJS = $(MSWDIR)\helpctrl.obj \
$(MSWDIR)\winpars.obj
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
ARCHINCDIR=$(WXDIR)\lib\msw
ARCHSETUPH=$(ARCHINCDIR)\wx\setup.h
default: wx

5
src/stc/makefile.b32
View File

@ -70,6 +70,8 @@ STCCPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(STCCFG)
default: $(STCCFG) $(LIBTARGET)
cleancfg:
del $(STCCFG)
{$(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
-I$(WXDIR)\include\wx\msw\gnuwin32
-I$(WXDIR)\include\wx\msw\gnuwin32;$(ARCHINCDIR)
-L$(BCCDIR)\lib
-D__WXWIN__