Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BC++ 32-bit makefile now copies setup.h to the correct place

Browse Source 
Fixed compilo in treetest.cpp
Fixed version numbers in make*.env
Added dummy keyboard.rc so makefile.vc works


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-04-08 14:12:56 +00:00
parent 1a65fc6586
commit 9f24e0b5b4
8 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -155,18 +155,29 @@ MSWOBJS = #$ ExpandList("WXMSWOBJS");
HTMLOBJS = #$ ExpandList("WXHTMLOBJS"); HTMLOBJS = #$ ExpandList("WXHTMLOBJS");
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
ARCHINCDIR=$(WXDIR)\lib\msw
ARCHSETUPH=$(ARCHINCDIR)\wx\setup.h
default: wx default: wx
wx: setuph $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET) wx: $(ARCHINCDIR)\wx makesetuph makearchsetuph $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
# TODO: put the setup.h under lib all: wx
setuph:
# Copy the in-CVS setup0.h to setup.h if necessary
makesetuph:
cd $(WXDIR)\include\wx\msw cd $(WXDIR)\include\wx\msw
if not exist setup.h copy setup0.h setup.h if not exist setup.h copy setup0.h setup.h
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
all: wx # Copy include\wx\msw\setup.h to the architecture-specific location
makearchsetuph:
copy $(WXDIR)\include\wx\msw\setup.h $(ARCHSETUPH)
cd $(WXDIR)\src\msw
$(ARCHINCDIR)\wx:
mkdir $(ARCHINCDIR)
mkdir $(ARCHINCDIR)\wx
!if "$(DLL)" == "0" !if "$(DLL)" == "0"
@@ -347,7 +358,7 @@ $(CFG): makefile.b32
-w-hid # virtual function A hides virtual function B -w-hid # virtual function A hides virtual function B
-tWM -tWM
-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/tiff -I$(ARCHINCDIR);-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/tiff
-I$(WXDIR)\include\wx\msw\gnuwin32 -I$(WXDIR)\include\wx\msw\gnuwin32
-L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk -L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk

2
docs/readme.txt
View File

@@ -222,5 +222,5 @@ web site.
Have fun! Have fun!
The wxWindows Team, 10th June, 2001 The wxWindows Team, April 2002

1
samples/keyboard/keyboard.rc Normal file
View File

@@ -0,0 +1 @@
/* Placeholder so makefile doesn't complain */

4
samples/makefile.vc
View File

@@ -70,10 +70,8 @@ all:
nmake -f makefile.vc $(MAKEFLAGS) nmake -f makefile.vc $(MAKEFLAGS)
cd $(WXDIR)\samples\newgrid cd $(WXDIR)\samples\newgrid
nmake -f makefile.vc $(MAKEFLAGS) nmake -f makefile.vc $(MAKEFLAGS)
!if "$(COMPIL)"==""
cd $(WXDIR)\samples\help cd $(WXDIR)\samples\help
nmake -f makefile.vc $(MAKEFLAGS) nmake -f makefile.vc $(MAKEFLAGS)
!endif
!if "$(PNGSETUP)"=="" !if "$(PNGSETUP)"==""
cd $(WXDIR)\samples\html cd $(WXDIR)\samples\html
nmake -f makefile.vc $(MAKEFLAGS) nmake -f makefile.vc $(MAKEFLAGS)
@@ -276,10 +274,8 @@ clean:
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\validate cd $(WXDIR)\samples\validate
nmake -f makefile.vc clean nmake -f makefile.vc clean
!if "$(NOMAKE)"==""
cd $(WXDIR)\samples\wizard cd $(WXDIR)\samples\wizard
nmake -f makefile.vc clean nmake -f makefile.vc clean
!endif
cd $(WXDIR)\samples\sockets cd $(WXDIR)\samples\sockets
nmake -f makefile.vc clean nmake -f makefile.vc clean

2
samples/treectrl/treetest.cpp
View File

@@ -669,7 +669,7 @@ void MyTreeCtrl::CreateImageList(int size)
} }
else else
{ {
images->Add(wxBitmap(icons[i].ConvertToImage().Rescale(size, size))); images->Add(wxBitmap(wxBitmap(icons[i]).ConvertToImage().Rescale(size, size)));
} }
} }
#endif // MSW/!MSW #endif // MSW/!MSW

4
src/makeb32.env
View File

@@ -48,7 +48,7 @@ DLL=0
!if "$(WXMAKINGDLL)" == "1" !if "$(WXMAKINGDLL)" == "1"
DLL_FLAGS= -DWXMAKINGDLL=1 -D_RTLDLL DLL_FLAGS= -DWXMAKINGDLL=1 -D_RTLDLL
WXLIB= $(WXLIBDIR)\wx232.lib WXLIB= $(WXLIBDIR)\wx233.lib
!else !else
@@ -56,7 +56,7 @@ LINK_FLAGS= /aa /c
!if "$(WXUSINGDLL)" == "1" !if "$(WXUSINGDLL)" == "1"
DLL_FLAGS= -DWXUSINGDLL=1 -D_RTLDLL DLL_FLAGS= -DWXUSINGDLL=1 -D_RTLDLL
WXLIB= $(WXLIBDIR)\wx232.lib WXLIB= $(WXLIBDIR)\wx233.lib
!else !else
DLL_FLAGS= DLL_FLAGS=
WXLIB= $(WXLIBDIR)\wx32.lib WXLIB= $(WXLIBDIR)\wx32.lib

2
src/makeg95.env
View File

@@ -18,7 +18,7 @@ MINGW32=1
MINGW32VERSION=2.95 MINGW32VERSION=2.95
# If building DLL, the version # If building DLL, the version
WXVERSION=232 WXVERSION=233
ifndef UNICODE ifndef UNICODE
UNICODE=0 UNICODE=0

21
src/msw/makefile.b32
View File

@@ -376,18 +376,29 @@ HTMLOBJS = $(MSWDIR)\helpctrl.obj \
$(MSWDIR)\winpars.obj $(MSWDIR)\winpars.obj
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
ARCHINCDIR=$(WXDIR)\lib\msw
ARCHSETUPH=$(ARCHINCDIR)\wx\setup.h
default: wx default: wx
wx: setuph $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET) wx: $(ARCHINCDIR)\wx makesetuph makearchsetuph $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
# TODO: put the setup.h under lib all: wx
setuph:
# Copy the in-CVS setup0.h to setup.h if necessary
makesetuph:
cd $(WXDIR)\include\wx\msw cd $(WXDIR)\include\wx\msw
if not exist setup.h copy setup0.h setup.h if not exist setup.h copy setup0.h setup.h
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
all: wx # Copy include\wx\msw\setup.h to the architecture-specific location
makearchsetuph:
copy $(WXDIR)\include\wx\msw\setup.h $(ARCHSETUPH)
cd $(WXDIR)\src\msw
$(ARCHINCDIR)\wx:
mkdir $(ARCHINCDIR)
mkdir $(ARCHINCDIR)\wx
!if "$(DLL)" == "0" !if "$(DLL)" == "0"
@@ -1106,7 +1117,7 @@ $(CFG): makefile.b32
-w-hid # virtual function A hides virtual function B -w-hid # virtual function A hides virtual function B
-tWM -tWM
-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/tiff -I$(ARCHINCDIR);$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/tiff
-I$(WXDIR)\include\wx\msw\gnuwin32 -I$(WXDIR)\include\wx\msw\gnuwin32
-L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk -L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk