change the selection appropriately (and refresh it as needed) after deleting a notebo...

[wxWidgets.git] / src / msw / makefile.b32

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 9aa4f72a75863aa37906bafb8a32ea3ec699a1d4..d57aada93b7a8e5f1f6ef42d731d3620fb6b36aa 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -15,9 +15,7 @@
 # Makefile : Builds wxWindows library wx.lib for MS Windows,
 # and Borland C++ (32-bit).
 
-!if "$(BCCDIR)" == ""
-!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
-!endif
+# BCCDIR now defined in ../makeb32.env
 
 !if "$(WXWIN)" == ""
 !error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
@@ -74,6 +72,7 @@ DOCDIR = $(WXDIR)\docs
 GENERICOBJS= $(MSWDIR)\busyinfo.obj \
                $(MSWDIR)\calctrl.obj \
                $(MSWDIR)\choicdgg.obj \
+               $(MSWDIR)\dcbuffer.obj \
                $(MSWDIR)\dcpsg.obj \
                $(MSWDIR)\dirctrlg.obj \
                $(MSWDIR)\dragimgg.obj \
@@ -115,6 +114,8 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
 COMMONOBJS = \
                $(MSWDIR)\y_tab.obj \
                $(MSWDIR)\appcmn.obj \
+               $(MSWDIR)\artprov.obj \
+               $(MSWDIR)\artstd.obj \
                $(MSWDIR)\choiccmn.obj \
                $(MSWDIR)\clipcmn.obj \
                $(MSWDIR)\clntdata.obj \
@@ -168,9 +169,11 @@ COMMONOBJS = \
                $(MSWDIR)\hashmap.obj \
                $(MSWDIR)\helpbase.obj \
                $(MSWDIR)\http.obj \
+               $(MSWDIR)\iconbndl.obj \
                $(MSWDIR)\imagall.obj \
                $(MSWDIR)\imagbmp.obj \
                $(MSWDIR)\image.obj \
+               $(MSWDIR)\imagfill.obj \
                $(MSWDIR)\imaggif.obj \
                $(MSWDIR)\imagiff.obj \
                $(MSWDIR)\imagjpeg.obj \
@@ -191,6 +194,7 @@ COMMONOBJS = \
                $(MSWDIR)\menucmn.obj \
                $(MSWDIR)\mimecmn.obj \
                $(MSWDIR)\module.obj \
+               $(MSWDIR)\msgout.obj \
                $(MSWDIR)\mstream.obj \
                $(MSWDIR)\nbkbase.obj \
                $(MSWDIR)\object.obj \
@@ -208,6 +212,7 @@ COMMONOBJS = \
                $(MSWDIR)\sckfile.obj \
                $(MSWDIR)\sckipc.obj \
                $(MSWDIR)\sckstrm.obj \
+               $(MSWDIR)\settcmn.obj \
                $(MSWDIR)\sizer.obj \
                $(MSWDIR)\socket.obj \
                $(MSWDIR)\statbar.obj \
@@ -294,6 +299,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\helpwin.obj \
                $(MSWDIR)\icon.obj \
                $(MSWDIR)\imaglist.obj \
+               $(MSWDIR)\iniconf.obj \
                $(MSWDIR)\joystick.obj \
                $(MSWDIR)\listbox.obj \
                $(MSWDIR)\listctrl.obj \
@@ -313,6 +319,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\palette.obj \
                $(MSWDIR)\pen.obj \
                $(MSWDIR)\penwin.obj \
+               $(MSWDIR)\popupwin.obj \
                $(MSWDIR)\printdlg.obj \
                $(MSWDIR)\printwin.obj \
                $(MSWDIR)\radiobox.obj \
@@ -374,15 +381,24 @@ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
 default:       wx
 
-wx:    setuph $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+wx:    $(ARCHINCDIR)\wx makesetuph makearchsetuph $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+
+all:   wx
 
-# TODO: put the setup.h under lib
-setuph:
+# 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"
 
@@ -404,15 +420,15 @@ nul
 $(PERIPH_LIBS) $(LIBS)
 wxb32
 !
-       -erase $(WXLIBDIR)\version.res
-        brc32 -r -i$(WXDIR)\include\ $(MSWDIR)\version.rc
         implib -c $(LIBTARGET) $(WXLIBDIR)\wx.dll
-
 !endif
 
 dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
 dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h version.res
 
+version.res: 
+       brc32 -r -i$(WXDIR)\include\ $(MSWDIR)\version.rc
+
 $(MSWDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
 
 #        cl @<<
@@ -537,6 +553,8 @@ $(MSWDIR)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF)
 
 $(MSWDIR)\imaglist.obj: $(MSWDIR)\imaglist.$(SRCSUFF)
 
+$(MSWDIR)\iniconf.obj: $(MSWDIR)\iniconf.$(SRCSUFF)
+
 $(MSWDIR)\joystick.obj: $(MSWDIR)\joystick.$(SRCSUFF)
 
 $(MSWDIR)\listbox.obj: $(MSWDIR)\listbox.$(SRCSUFF)
@@ -575,6 +593,8 @@ $(MSWDIR)\pen.obj: $(MSWDIR)\pen.$(SRCSUFF)
 
 $(MSWDIR)\penwin.obj: $(MSWDIR)\penwin.$(SRCSUFF)
 
+$(MSWDIR)\popupwin.obj: $(MSWDIR)\popupwin.$(SRCSUFF)
+
 $(MSWDIR)\printdlg.obj: $(MSWDIR)\printdlg.$(SRCSUFF)
 
 $(MSWDIR)\printwin.obj: $(MSWDIR)\printwin.$(SRCSUFF)
@@ -650,6 +670,10 @@ $(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF)
 
 $(MSWDIR)\appcmn.obj: $(COMMDIR)\appcmn.$(SRCSUFF)
 
+$(MSWDIR)\artprov.obj: $(COMMDIR)\artprov.$(SRCSUFF)
+
+$(MSWDIR)\artstd.obj: $(COMMDIR)\artstd.$(SRCSUFF)
+
 $(MSWDIR)\choiccmn.obj: $(COMMDIR)\choiccmn.$(SRCSUFF)
 
 $(MSWDIR)\clipcmn.obj: $(COMMDIR)\clipcmn.$(SRCSUFF)
@@ -756,12 +780,16 @@ $(MSWDIR)\helpbase.obj: $(COMMDIR)\helpbase.$(SRCSUFF)
 
 $(MSWDIR)\http.obj: $(COMMDIR)\http.$(SRCSUFF)
 
+$(MSWDIR)\iconbndl.obj: $(COMMDIR)\iconbndl.$(SRCSUFF)
+
 $(MSWDIR)\imagall.obj: $(COMMDIR)\imagall.$(SRCSUFF)
 
 $(MSWDIR)\imagbmp.obj: $(COMMDIR)\imagbmp.$(SRCSUFF)
 
 $(MSWDIR)\image.obj: $(COMMDIR)\image.$(SRCSUFF)
 
+$(MSWDIR)\imagfill.obj: $(COMMDIR)\imagfill.$(SRCSUFF)
+
 $(MSWDIR)\imaggif.obj: $(COMMDIR)\imaggif.$(SRCSUFF)
 
 $(MSWDIR)\imagiff.obj: $(COMMDIR)\imagiff.$(SRCSUFF)
@@ -802,6 +830,8 @@ $(MSWDIR)\mimecmn.obj: $(COMMDIR)\mimecmn.$(SRCSUFF)
 
 $(MSWDIR)\module.obj: $(COMMDIR)\module.$(SRCSUFF)
 
+$(MSWDIR)\msgout.obj: $(COMMDIR)\msgout.$(SRCSUFF)
+
 $(MSWDIR)\mstream.obj: $(COMMDIR)\mstream.$(SRCSUFF)
 
 $(MSWDIR)\nbkbase.obj: $(COMMDIR)\nbkbase.$(SRCSUFF)
@@ -836,6 +866,8 @@ $(MSWDIR)\sckipc.obj: $(COMMDIR)\sckipc.$(SRCSUFF)
 
 $(MSWDIR)\sckstrm.obj: $(COMMDIR)\sckstrm.$(SRCSUFF)
 
+$(MSWDIR)\settcmn.obj: $(COMMDIR)\settcmn.$(SRCSUFF)
+
 $(MSWDIR)\sizer.obj: $(COMMDIR)\sizer.$(SRCSUFF)
 
 $(MSWDIR)\socket.obj: $(COMMDIR)\socket.$(SRCSUFF)
@@ -908,6 +940,8 @@ $(MSWDIR)\calctrl.obj: $(GENDIR)\calctrl.$(SRCSUFF)
 
 $(MSWDIR)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF)
 
+$(MSWDIR)\dcbuffer.obj: $(GENDIR)\dcbuffer.$(SRCSUFF)
+
 $(MSWDIR)\dcpsg.obj: $(GENDIR)\dcpsg.$(SRCSUFF)
 
 $(MSWDIR)\dirctrlg.obj: $(GENDIR)\dirctrlg.$(SRCSUFF)
@@ -1014,67 +1048,67 @@ $(MSWDIR)\winpars.obj: $(HTMLDIR)\winpars.$(SRCSUFF)
 
 all_utils:
     cd $(WXDIR)\utils
-    make -f makefile.b32
+    ${MAKE} -f makefile.b32
     cd $(WXDIR)\src\msw
 
 all_samples:
     cd $(WXDIR)\samples
-    make -f makefile.b32
+    ${MAKE} -f makefile.b32
     cd $(WXDIR)\src\msw
 
 all_execs:
     cd $(WXDIR)\utils
-    make -f makefile.b32 all_execs
+    ${MAKE} -f makefile.b32 all_execs
     cd $(WXDIR)\src\msw
 
 png:    $(CFG)
         cd $(WXDIR)\src\png
-        make -f makefile.b32
+        ${MAKE} -f makefile.b32
         cd $(WXDIR)\src\msw
 
 clean_png:
         cd $(WXDIR)\src\png
-        make -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 clean
         cd $(WXDIR)\src\msw
 
 zlib:   $(CFG)
         cd $(WXDIR)\src\zlib
-        make -f makefile.b32 lib
+        ${MAKE} -f makefile.b32 lib
         cd $(WXDIR)\src\msw
 
 clean_zlib:
         cd $(WXDIR)\src\zlib
-        make -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 clean
         cd $(WXDIR)\src\msw
 
 jpeg:    $(CFG)
         cd $(WXDIR)\src\jpeg
-        make -f makefile.b32
+        ${MAKE} -f makefile.b32
         cd $(WXDIR)\src\msw
 
 clean_jpeg:
         cd $(WXDIR)\src\jpeg
-        make -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 clean
         cd $(WXDIR)\src\msw
 
 regex:   $(CFG)
         cd $(WXDIR)\src\regex
-        make -f makefile.b32 lib
+        ${MAKE} -f makefile.b32 lib
         cd $(WXDIR)\src\msw
 
 clean_regex:
         cd $(WXDIR)\src\regex
-        make -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 clean
         cd $(WXDIR)\src\msw
 
 tiff:   $(CFG)
         cd $(WXDIR)\src\tiff
-        make -f makefile.b32 lib
+        ${MAKE} -f makefile.b32 lib
         cd $(WXDIR)\src\msw
 
 clean_tiff:
         cd $(WXDIR)\src\tiff
-        make -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 clean
         cd $(WXDIR)\src\msw
 
 $(CFG): makefile.b32
@@ -1091,7 +1125,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
@@ -1149,65 +1183,65 @@ portingps:      $(WXDIR)\docs\ps\porting.ps
 
 allhlp: wxhlp portinghlp prophlp
         cd $(WXDIR)\utils\dialoged\src
-        make -f makefile.b32 hlp
+        ${MAKE} -f makefile.b32 hlp
         cd $(THISDIR)
 
 #        cd $(WXDIR)\utils\wxhelp\src
-#        make -f makefile.b32 hlp
+#        ${MAKE} -f makefile.b32 hlp
 #        cd $(WXDIR)\utils\tex2rtf\src
-#        make -f makefile.b32 hlp
+#        ${MAKE} -f makefile.b32 hlp
 #        cd $(WXDIR)\utils\wxgraph\src
-#        make -f makefile.b32 hlp
+#        ${MAKE} -f makefile.b32 hlp
 #        cd $(WXDIR)\utils\wxchart\src
-#        make -f makefile.b32 hlp
+#        ${MAKE} -f makefile.b32 hlp
 #        cd $(WXDIR)\utils\wxtree\src
-#        make -f makefile.b32 hlp
+#        ${MAKE} -f makefile.b32 hlp
 #        cd $(WXDIR)\utils\wxbuild\src
-#        make -f makefile.b32 hlp
+#        ${MAKE} -f makefile.b32 hlp
 #        cd $(WXDIR)\utils\wxgrid\src
-#        make -f makefile.b32 hlp
+#        ${MAKE} -f makefile.b32 hlp
 
 allhtml: wxhtml portinghtml prophtml
         cd $(WXDIR)\utils\dialoged\src
-        make -f makefile.b32 html
+        ${MAKE} -f makefile.b32 html
         cd $(THISDIR)
 
-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html
 #        cd $(WXDIR)\utils\dialoged\src
-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html
 #        cd $(WXDIR)\utils\hytext\src
-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html
 #        cd $(WXDIR)\utils\wxhelp\src
-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html
 #        cd $(WXDIR)\utils\tex2rtf\src
-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html
 #        cd $(WXDIR)\utils\wxgraph\src
-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html
 #        cd $(WXDIR)\utils\wxchart\src
-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html
 #        cd $(WXDIR)\utils\wxtree\src
-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html
 
 allps: wxps referencps portingps propps
         cd $(WXDIR)\utils\dialoged\src
-        make -f makefile.b32 ps
+        ${MAKE} -f makefile.b32 ps
         cd $(THISDIR)
 
 allpdfrtf: pdfrtf portingpdfrtf proppdfrtf
         cd $(WXDIR)\utils\dialoged\src
-        make -f makefile.b32 pdfrtf
+        ${MAKE} -f makefile.b32 pdfrtf
         cd $(THISDIR)
 
 #        cd $(WXDIR)\utils\wxhelp\src
-#        make -f makefile.b32 ps
+#        ${MAKE} -f makefile.b32 ps
 #        cd $(WXDIR)\utils\tex2rtf\src
-#        make -f makefile.b32 ps
+#        ${MAKE} -f makefile.b32 ps
 #        cd $(WXDIR)\utils\wxgraph\src
-#        make -f makefile.b32 ps
+#        ${MAKE} -f makefile.b32 ps
 #        cd $(WXDIR)\utils\wxchart\src
-#        make -f makefile.b32 ps
+#        ${MAKE} -f makefile.b32 ps
 #        cd $(WXDIR)\utils\wxtree\src
-#        make -f makefile.b32 ps
+#        ${MAKE} -f makefile.b32 ps
 #        cd $(THISDIR)
 
 $(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj