X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57a7b7c1484fda95240972aae876bdbdbbc98344..3d7e30a4186cc3379c3b21040712181a3c6d0b3b:/src/msw/makefile.b32

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index b44de26681..a095362bdc 100644
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -19,6 +19,13 @@
 !endif
 
 WXDIR = $(WXWIN)
+
+# Set all these to 1 if you want to build a dynamic library
+!if "$(DLL)" == "1"
+WXMAKINGDLL=1
+WXBUILDDLL=1
+!endif
+
 !include $(WXDIR)\src\makeb32.env
 
 # Please set these according to the settings in wx_setup.h, so we can include
@@ -43,8 +50,18 @@ PERIPH_TARGET=xpm $(PERIPH_TARGET)
 PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
 !endif
 
-LIBTARGET= $(WXLIBDIR)\wx32.lib
+PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(PERIPH_LIBS)
+PERIPH_TARGET=zlib png $(PERIPH_TARGET)
+PERIPH_CLEAN_TARGET=clean_zlib clean_png $(PERIPH_CLEAN_TARGET)
+
+!if "$(DLL)" == "0"
 DUMMY=dummy
+!else
+DUMMY=dummydll
+LIBS= cw32 import32 ole2w32
+!endif
+
+LIBTARGET=$(WXLIB)
 
 GENDIR=..\generic
 COMMDIR=..\common
@@ -59,16 +76,19 @@ GENERICOBJS= \
   $(MSWDIR)\fontdlgg.obj \
   $(MSWDIR)\gridg.obj \
   $(MSWDIR)\helpxlp.obj \
+  $(MSWDIR)\laywin.obj \
   $(MSWDIR)\msgdlgg.obj \
   $(MSWDIR)\panelg.obj \
-  $(MSWDIR)\printps.obj \
-  $(MSWDIR)\prntdlgg.obj \
+  $(MSWDIR)\sashwin.obj \
   $(MSWDIR)\scrolwin.obj \
   $(MSWDIR)\splitter.obj \
   $(MSWDIR)\statusbr.obj \
   $(MSWDIR)\tabg.obj \
   $(MSWDIR)\textdlgg.obj
 
+#  $(MSWDIR)\printps.obj \
+#  $(MSWDIR)\prntdlgg.obj \
+
 COMMONOBJS = \
   $(MSWDIR)\config.obj \
   $(MSWDIR)\cmndata.obj \
@@ -82,6 +102,7 @@ COMMONOBJS = \
   $(MSWDIR)\framecmn.obj \
   $(MSWDIR)\gdicmn.obj \
   $(MSWDIR)\helpbase.obj \
+  $(MSWDIR)\image.obj \
   $(MSWDIR)\intl.obj \
   $(MSWDIR)\ipcbase.obj \
   $(MSWDIR)\log.obj \
@@ -89,7 +110,6 @@ COMMONOBJS = \
   $(MSWDIR)\memory.obj \
   $(MSWDIR)\module.obj \
   $(MSWDIR)\object.obj \
-  $(MSWDIR)\odbc.obj \
   $(MSWDIR)\postscrp.obj \
   $(MSWDIR)\prntbase.obj \
   $(MSWDIR)\resource.obj \
@@ -100,6 +120,7 @@ COMMONOBJS = \
   $(MSWDIR)\utilscmn.obj \
   $(MSWDIR)\validate.obj \
   $(MSWDIR)\valtext.obj \
+  $(MSWDIR)\variant.obj \
   $(MSWDIR)\date.obj \
   $(MSWDIR)\hash.obj \
   $(MSWDIR)\list.obj \
@@ -108,13 +129,26 @@ COMMONOBJS = \
   $(MSWDIR)\wxexpr.obj \
   $(MSWDIR)\y_tab.obj \
   $(MSWDIR)\stream.obj \
-  $(MSWDIR)\fstream.obj \
+  $(MSWDIR)\wfstream.obj \
   $(MSWDIR)\mstream.obj \
   $(MSWDIR)\zstream.obj \
   $(MSWDIR)\datstrm.obj \
+  $(MSWDIR)\sckstrm.obj \
   $(MSWDIR)\extended.obj \
-  $(MSWDIR)\wincmn.obj
-
+  $(MSWDIR)\wincmn.obj \
+  $(MSWDIR)\objstrm.obj \
+  $(MSWDIR)\dynlib.obj \
+  $(MSWDIR)\tokenzr.obj \
+  $(MSWDIR)\socket.obj \
+  $(MSWDIR)\sckaddr.obj \
+  $(MSWDIR)\protocol.obj \
+  $(MSWDIR)\url.obj \
+  $(MSWDIR)\http.obj \
+  $(MSWDIR)\ftp.obj \
+  $(MSWDIR)\sckfile.obj \
+  $(MSWDIR)\sckipc.obj
+
+#  $(MSWDIR)\odbc.obj \
 #  $(MSWDIR)\matrix.obj \
 
 MSWOBJS = \
@@ -143,6 +177,7 @@ MSWOBJS = \
   $(MSWDIR)\dde.obj \
   $(MSWDIR)\dialog.obj \
   $(MSWDIR)\dib.obj \
+  $(MSWDIR)\dibutils.obj \
   $(MSWDIR)\dirdlg.obj \
   $(MSWDIR)\filedlg.obj \
   $(MSWDIR)\font.obj \
@@ -170,6 +205,7 @@ MSWOBJS = \
   $(MSWDIR)\palette.obj \
   $(MSWDIR)\pen.obj \
   $(MSWDIR)\penwin.obj \
+  $(MSWDIR)\pnghand.obj \
   $(MSWDIR)\printdlg.obj \
   $(MSWDIR)\printwin.obj \
   $(MSWDIR)\radiobox.obj \
@@ -200,10 +236,13 @@ MSWOBJS = \
   $(MSWDIR)\window.obj \
   $(MSWDIR)\droptgt.obj \
   $(MSWDIR)\dropsrc.obj \
-  $(MSWDIR)\dataobj.obj \
   $(MSWDIR)\oleutils.obj \
+  $(MSWDIR)\dataobj.obj \
   $(MSWDIR)\uuid.obj
 
+# Unfortunately this causes a crash when the oleauto sample starts.
+#  $(MSWDIR)\automtn.obj
+
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
 
 default:	wx
@@ -212,12 +251,30 @@ wx:    $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
 
 all:	all_libs all_execs
 
+!if "$(DLL)" == "0"
+
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(BASEOBJECTS)
-	erase $(LIBTARGET)
+        erase $(LIBTARGET)
 	tlib $(LIBTARGET) /P512 @&&!
 -+$(OBJECTS:.obj =.obj -+) -+$(BASEOBJECTS:.obj =.obj -+) -+$(PERIPH_LIBS:.lib =.lib -+)
 !
 
+!else
+
+$(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(BASEOBJECTS)
+	erase $(LIBTARGET)
+	erase $(WXLIBDIR)\wx.dll
+        tlink32 $(LINK_FLAGS) /v @&&!
+c0d32.obj $(OBJECTS)
+$(WXLIBDIR)\wx
+nul
+$(PERIPH_LIBS) $(LIBS)
+wxb32
+!
+        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
 
@@ -403,6 +460,8 @@ $(MSWDIR)\oleutils.obj:     $(OLEDIR)\oleutils.$(SRCSUFF)
 
 $(MSWDIR)\uuid.obj:     $(OLEDIR)\uuid.$(SRCSUFF)
 
+$(MSWDIR)\automtn.obj:     $(OLEDIR)\automtn.$(SRCSUFF)
+
 ########################################################
 # Common objects (always compiled)
 
@@ -416,6 +475,8 @@ $(MSWDIR)\docmdi.obj:     $(COMMDIR)\docmdi.$(SRCSUFF)
 
 $(MSWDIR)\dynarray.obj:     $(COMMDIR)\dynarray.$(SRCSUFF)
 
+$(MSWDIR)\dynlib.obj:   $(COMMDIR)\dynlib.$(SRCSUFF)
+
 $(MSWDIR)\event.obj:     $(COMMDIR)\event.$(SRCSUFF)
 
 $(MSWDIR)\file.obj:     $(COMMDIR)\file.$(SRCSUFF)
@@ -428,6 +489,8 @@ $(MSWDIR)\framecmn.obj:     $(COMMDIR)\framecmn.$(SRCSUFF)
 
 $(MSWDIR)\gdicmn.obj:     $(COMMDIR)\gdicmn.$(SRCSUFF)
 
+$(MSWDIR)\image.obj:     $(COMMDIR)\image.$(SRCSUFF)
+
 $(MSWDIR)\intl.obj:     $(COMMDIR)\intl.$(SRCSUFF)
 
 $(MSWDIR)\ipcbase.obj:     $(COMMDIR)\ipcbase.$(SRCSUFF)
@@ -476,24 +539,48 @@ $(MSWDIR)\list.obj:     $(COMMDIR)\list.$(SRCSUFF)
 
 $(MSWDIR)\string.obj:     $(COMMDIR)\string.$(SRCSUFF)
 
+$(MSWDIR)\variant.obj:     $(COMMDIR)\variant.$(SRCSUFF)
+
 $(MSWDIR)\matrix.obj:     $(COMMDIR)\matrix.$(SRCSUFF)
 
 $(MSWDIR)\time.obj:     $(COMMDIR)\time.$(SRCSUFF)
 
 $(MSWDIR)\datstrm.obj:	$(COMMDIR)\datstrm.$(SRCSUFF)
 
+$(MSWDIR)\sckstrm.obj:  $(COMMDIR)\sckstrm.$(SRCSUFF)
+
 $(MSWDIR)\mstream.obj:	$(COMMDIR)\mstream.$(SRCSUFF)
 
 $(MSWDIR)\zstream.obj:	$(COMMDIR)\zstream.$(SRCSUFF)
 
-$(MSWDIR)\fstream.obj:	$(COMMDIR)\fstream.$(SRCSUFF)
+$(MSWDIR)\wfstream.obj:	$(COMMDIR)\wfstream.$(SRCSUFF)
 
 $(MSWDIR)\stream.obj:	$(COMMDIR)\stream.$(SRCSUFF)
 
+$(MSWDIR)\objstrm.obj:  $(COMMDIR)\objstrm.$(SRCSUFF)
+
 $(MSWDIR)\wincmn.obj:	$(COMMDIR)\wincmn.$(SRCSUFF)
 
 $(MSWDIR)\extended.obj:	$(COMMDIR)\extended.c
 
+$(MSWDIR)\tokenzr.obj:	$(COMMDIR)\tokenzr.$(SRCSUFF)
+
+$(MSWDIR)\socket.obj:	$(COMMDIR)\socket.$(SRCSUFF)
+
+$(MSWDIR)\sckaddr.obj:	$(COMMDIR)\sckaddr.$(SRCSUFF)
+
+$(MSWDIR)\protocol.obj: $(COMMDIR)\protocol.$(SRCSUFF)
+
+$(MSWDIR)\url.obj:	$(COMMDIR)\url.$(SRCSUFF)
+
+$(MSWDIR)\http.obj:	$(COMMDIR)\http.$(SRCSUFF)
+
+$(MSWDIR)\ftp.obj:	$(COMMDIR)\ftp.$(SRCSUFF)
+
+$(MSWDIR)\sckfile.obj:	$(COMMDIR)\sckfile.$(SRCSUFF)
+
+$(MSWDIR)\sckipc.obj:	$(COMMDIR)\sckipc.$(SRCSUFF)
+
 ########################################################
 # Generic objects (not always compiled, depending on
 # whether platforms have native implementations)
@@ -508,6 +595,8 @@ $(MSWDIR)\gridg.obj:     $(GENDIR)\gridg.$(SRCSUFF)
 
 $(MSWDIR)\helpxlp.obj:     $(GENDIR)\helpxlp.$(SRCSUFF)
 
+$(MSWDIR)\laywin.obj:     $(GENDIR)\laywin.$(SRCSUFF)
+
 $(MSWDIR)\msgdlgg.obj:     $(GENDIR)\msgdlgg.$(SRCSUFF)
 
 $(MSWDIR)\panelg.obj:     $(GENDIR)\panelg.$(SRCSUFF)
@@ -516,6 +605,8 @@ $(MSWDIR)\printps.obj:     $(GENDIR)\printps.$(SRCSUFF)
 
 $(MSWDIR)\prntdlgg.obj:     $(GENDIR)\prntdlgg.$(SRCSUFF)
 
+$(MSWDIR)\sashwin.obj:     $(GENDIR)\sashwin.$(SRCSUFF)
+
 $(MSWDIR)\scrolwin.obj:     $(GENDIR)\scrolwin.$(SRCSUFF)
 
 $(MSWDIR)\splitter.obj:     $(GENDIR)\splitter.$(SRCSUFF)
@@ -561,6 +652,26 @@ wxxpm:	$(CFG)
 	make -f makefile.b32 -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
 	cd $(WXDIR)\src\msw
 
+png:    $(CFG)
+        cd $(WXDIR)\src\png
+        make -f makefile.b32 
+        cd $(WXDIR)\src\msw
+
+clean_png:
+        cd $(WXDIR)\src\png
+        make -f makefile.b32 clean
+        cd $(WXDIR)\src\msw
+
+zlib:   $(CFG)
+        cd $(WXDIR)\src\zlib
+        make -f makefile.b32 lib
+        cd $(WXDIR)\src\msw
+
+clean_zlib:
+        cd $(WXDIR)\src\zlib
+        make -f makefile.b32 clean
+        cd $(WXDIR)\src\msw
+
 $(CFG): makefile.b32
 	copy &&!
 -H=$(WXDIR)\src\msw\wx32.csm
@@ -576,11 +687,12 @@ $(CFG): makefile.b32
 -WE
 
 -I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/zlib
--I$(WXDIR)\include\msw\gnuwin32
+-I$(WXDIR)\include\wx\msw\gnuwin32
 
 -L$(BCCDIR)\lib
 -D__WXWIN__
 -D__WXMSW__
+-D__WINDOWS__
 -DWIN32
 $(OPT)
 $(DEBUG_FLAGS)