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

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

diff --git a/distrib/msw/tmake/b32.t b/distrib/msw/tmake/b32.t
index 4d3cac8551f0505d4d29eb92666fa4d36eeac232..0a1966f6d51086e95c037884b0ea853c25b169c5 100644 (file)
--- a/distrib/msw/tmake/b32.t
+++ b/distrib/msw/tmake/b32.t
@@ -155,18 +155,29 @@ MSWOBJS = #$ ExpandList("WXMSWOBJS");
 HTMLOBJS = #$ ExpandList("WXHTMLOBJS");
 
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
+ARCHINCDIR=$(WXDIR)\lib\msw
+ARCHSETUPH=$(ARCHINCDIR)\wx\setup.h
 
 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
-setuph:
+all:   wx
+
+# Copy the in-CVS setup0.h to setup.h if necessary
+makesetuph:
      cd $(WXDIR)\include\wx\msw
      if not exist setup.h copy setup0.h setup.h
      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"
 
@@ -347,7 +358,7 @@ $(CFG): makefile.b32
 -w-hid # virtual function A hides virtual function B
 -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
 
 -L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk

diff --git a/docs/readme.txt b/docs/readme.txt
index b9544a6f2d430fc8462585b08a93b0afae34eb25..a4d705a5fd1df48579bc1df2a835b3d8fc0936e7 100644 (file)
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -222,5 +222,5 @@ web site.
 
 Have fun!
 
-The wxWindows Team, 10th June, 2001
+The wxWindows Team, April 2002
 

diff --git a/samples/keyboard/keyboard.rc b/samples/keyboard/keyboard.rc
new file mode 100644 (file)
index 0000000..2b5e356
--- /dev/null
+++ b/samples/keyboard/keyboard.rc
@@ -0,0 +1 @@
+/* Placeholder so makefile doesn't complain */

diff --git a/samples/makefile.vc b/samples/makefile.vc
index 37954e285f390af35564ed2a5a571cb63e666db4..eebeb8d5d5fd710a6f5fe88139ab5ab9b389631b 100644 (file)
--- a/samples/makefile.vc
+++ b/samples/makefile.vc
@@ -70,10 +70,8 @@ all:
         nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\newgrid
         nmake -f makefile.vc $(MAKEFLAGS)
-!if "$(COMPIL)"==""
         cd $(WXDIR)\samples\help
         nmake -f makefile.vc $(MAKEFLAGS)
-!endif
 !if "$(PNGSETUP)"==""
         cd $(WXDIR)\samples\html
         nmake -f makefile.vc $(MAKEFLAGS)
@@ -276,10 +274,8 @@ clean:
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\validate
         nmake -f makefile.vc clean
-!if "$(NOMAKE)"==""
         cd $(WXDIR)\samples\wizard
         nmake -f makefile.vc clean
-!endif
         cd $(WXDIR)\samples\sockets
         nmake -f makefile.vc clean
 

diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp
index 2eed27fb7d73edc8903d8e311c7d03d249661a5f..e7cb2cb8f5f4a9ed7348165241acd84ddf6ffe42 100644 (file)
--- a/samples/treectrl/treetest.cpp
+++ b/samples/treectrl/treetest.cpp
@@ -669,7 +669,7 @@ void MyTreeCtrl::CreateImageList(int size)
         }
         else
         {
-            images->Add(wxBitmap(icons[i].ConvertToImage().Rescale(size, size)));
+            images->Add(wxBitmap(wxBitmap(icons[i]).ConvertToImage().Rescale(size, size)));
         }
     }
 #endif // MSW/!MSW

diff --git a/src/makeb32.env b/src/makeb32.env
index e6a4ba6b933c6f8c1320e046866dd2c62ea5cb91..ac8e8f925fd3ec6774538472f1efc97fbd2d0cff 100644 (file)
--- a/src/makeb32.env
+++ b/src/makeb32.env
@@ -48,7 +48,7 @@ DLL=0
 
 !if "$(WXMAKINGDLL)" == "1"
 DLL_FLAGS= -DWXMAKINGDLL=1 -D_RTLDLL
-WXLIB= $(WXLIBDIR)\wx232.lib
+WXLIB= $(WXLIBDIR)\wx233.lib
 
 !else
 
@@ -56,7 +56,7 @@ LINK_FLAGS= /aa /c
 
 !if "$(WXUSINGDLL)" == "1"
 DLL_FLAGS= -DWXUSINGDLL=1 -D_RTLDLL
-WXLIB= $(WXLIBDIR)\wx232.lib
+WXLIB= $(WXLIBDIR)\wx233.lib
 !else
 DLL_FLAGS=
 WXLIB= $(WXLIBDIR)\wx32.lib

diff --git a/src/makeg95.env b/src/makeg95.env
index 64dc0d12fb3cea1694b32841edb721f2d2e3d9d7..e53d90b25c2d510aaadd705d4bd284cbd865ae9c 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -18,7 +18,7 @@ MINGW32=1
 MINGW32VERSION=2.95
 
 # If building DLL, the version
-WXVERSION=232
+WXVERSION=233
 
 ifndef UNICODE
   UNICODE=0

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 094457d0f7a59e922666c74898379493dfcf52ad..9600c9fb5e07de5a39aa0bc3992099eff38bcd1c 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -376,18 +376,29 @@ HTMLOBJS = $(MSWDIR)\helpctrl.obj \
                $(MSWDIR)\winpars.obj
 
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
+ARCHINCDIR=$(WXDIR)\lib\msw
+ARCHSETUPH=$(ARCHINCDIR)\wx\setup.h
 
 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
-setuph:
+all:   wx
+
+# Copy the in-CVS setup0.h to setup.h if necessary
+makesetuph:
      cd $(WXDIR)\include\wx\msw
      if not exist setup.h copy setup0.h setup.h
      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"
 
@@ -1106,7 +1117,7 @@ $(CFG): makefile.b32
 -w-hid # virtual function A hides virtual function B
 -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
 
 -L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk