Changed the "delete win" to the more proper "win->Destroy()" in

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

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 454bcdaeb32ba552ee72871a9843659e733df623..a095362bdc72e17c9c4a963cc98a873b8466fb62 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -21,9 +21,10 @@
 WXDIR = $(WXWIN)
 
 # Set all these to 1 if you want to build a dynamic library
-#DLL=1
-#WXMAKINGDLL=1
-#WXBUILDDLL=1
+!if "$(DLL)" == "1"
+WXMAKINGDLL=1
+WXBUILDDLL=1
+!endif
 
 !include $(WXDIR)\src\makeb32.env
 
@@ -49,9 +50,9 @@ PERIPH_TARGET=xpm $(PERIPH_TARGET)
 PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
 !endif
 
-PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(PERIPH_LIBS)
-PERIPH_TARGET=zlib $(PERIPH_TARGET)
-PERIPH_CLEAN_TARGET=clean_zlib $(PERIPH_CLEAN_TARGET)
+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
@@ -78,8 +79,6 @@ GENERICOBJS= \
   $(MSWDIR)\laywin.obj \
   $(MSWDIR)\msgdlgg.obj \
   $(MSWDIR)\panelg.obj \
-  $(MSWDIR)\printps.obj \
-  $(MSWDIR)\prntdlgg.obj \
   $(MSWDIR)\sashwin.obj \
   $(MSWDIR)\scrolwin.obj \
   $(MSWDIR)\splitter.obj \
@@ -87,6 +86,9 @@ GENERICOBJS= \
   $(MSWDIR)\tabg.obj \
   $(MSWDIR)\textdlgg.obj
 
+#  $(MSWDIR)\printps.obj \
+#  $(MSWDIR)\prntdlgg.obj \
+
 COMMONOBJS = \
   $(MSWDIR)\config.obj \
   $(MSWDIR)\cmndata.obj \
@@ -100,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 \
@@ -126,7 +129,7 @@ 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 \
@@ -174,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 \
@@ -201,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 \
@@ -235,6 +240,9 @@ MSWOBJS = \
   $(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
@@ -452,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)
 
@@ -479,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)
@@ -541,7 +553,7 @@ $(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)
 
@@ -640,6 +652,16 @@ 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