BC++/16-bit support now working, but without resource system

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

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index f0429cb5e6e6292da3816d20575c1ea499682234..341ce0bf04b9ac20ba8158c7a5eeaeea2fb2ea86 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -50,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
@@ -72,21 +72,27 @@ DOCDIR = $(WXDIR)\docs
 
 GENERICOBJS= \
   $(MSWDIR)\choicdgg.obj \
-  $(MSWDIR)\colrdlgg.obj \
-  $(MSWDIR)\fontdlgg.obj \
   $(MSWDIR)\gridg.obj \
-  $(MSWDIR)\helpxlp.obj \
+  $(MSWDIR)\imaglist.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)\textdlgg.obj \
+
+# Not needed:
+#  $(MSWDIR)\colrdlgg.obj \
+#  $(MSWDIR)\fontdlgg.obj \
+#  $(MSWDIR)\helpxlp.obj \
+#  $(MSWDIR)\msgdlgg.obj \
+#  $(MSWDIR)\printps.obj \
+#  $(MSWDIR)\prntdlgg.obj \
+#  $(MSWDIR)\listctrl.obj \
+#  $(MSWDIR)\notebook.obj \
+#  $(MSWDIR)\treectrl.obj
 
 COMMONOBJS = \
   $(MSWDIR)\config.obj \
@@ -101,6 +107,7 @@ COMMONOBJS = \
   $(MSWDIR)\framecmn.obj \
   $(MSWDIR)\gdicmn.obj \
   $(MSWDIR)\helpbase.obj \
+  $(MSWDIR)\image.obj \
   $(MSWDIR)\intl.obj \
   $(MSWDIR)\ipcbase.obj \
   $(MSWDIR)\log.obj \
@@ -175,6 +182,7 @@ MSWOBJS = \
   $(MSWDIR)\dde.obj \
   $(MSWDIR)\dialog.obj \
   $(MSWDIR)\dib.obj \
+  $(MSWDIR)\dibutils.obj \
   $(MSWDIR)\dirdlg.obj \
   $(MSWDIR)\filedlg.obj \
   $(MSWDIR)\font.obj \
@@ -202,6 +210,7 @@ MSWOBJS = \
   $(MSWDIR)\palette.obj \
   $(MSWDIR)\pen.obj \
   $(MSWDIR)\penwin.obj \
+  $(MSWDIR)\pnghand.obj \
   $(MSWDIR)\printdlg.obj \
   $(MSWDIR)\printwin.obj \
   $(MSWDIR)\radiobox.obj \
@@ -216,16 +225,16 @@ MSWOBJS = \
   $(MSWDIR)\spinbutt.obj \
   $(MSWDIR)\statbmp.obj \
   $(MSWDIR)\statbox.obj \
-  $(MSWDIR)\statbr95.obj \
   $(MSWDIR)\stattext.obj \
+  $(MSWDIR)\statbr95.obj \
   $(MSWDIR)\tabctrl.obj \
-  $(MSWDIR)\taskbar.obj \
-  $(MSWDIR)\tbar95.obj \
   $(MSWDIR)\tbarmsw.obj \
   $(MSWDIR)\textctrl.obj \
   $(MSWDIR)\thread.obj \
   $(MSWDIR)\timer.obj \
   $(MSWDIR)\treectrl.obj \
+  $(MSWDIR)\taskbar.obj \
+  $(MSWDIR)\tbar95.obj \
   $(MSWDIR)\utils.obj \
   $(MSWDIR)\utilsexc.obj \
   $(MSWDIR)\wave.obj \
@@ -236,6 +245,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
@@ -246,15 +258,15 @@ all:      all_libs all_execs
 
 !if "$(DLL)" == "0"
 
-$(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(BASEOBJECTS)
+$(LIBTARGET): $(DUMMY).obj $(OBJECTS)
         erase $(LIBTARGET)
        tlib $(LIBTARGET) /P512 @&&!
--+$(OBJECTS:.obj =.obj -+) -+$(BASEOBJECTS:.obj =.obj -+) -+$(PERIPH_LIBS:.lib =.lib -+)
+-+$(OBJECTS:.obj =.obj -+) -+$(PERIPH_LIBS:.lib =.lib -+)
 !
 
 !else
 
-$(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(BASEOBJECTS)
+$(LIBTARGET): $(DUMMY).obj $(OBJECTS)
        erase $(LIBTARGET)
        erase $(WXLIBDIR)\wx.dll
         tlink32 $(LINK_FLAGS) /v @&&!
@@ -453,6 +465,8 @@ $(MSWDIR)\oleutils.obj:     $(OLEDIR)\oleutils.$(SRCSUFF)
 
 $(MSWDIR)\uuid.obj:     $(OLEDIR)\uuid.$(SRCSUFF)
 
+$(MSWDIR)\automtn.obj:     $(OLEDIR)\automtn.$(SRCSUFF)
+
 ########################################################
 # Common objects (always compiled)
 
@@ -480,6 +494,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)
@@ -637,10 +653,20 @@ ctl3d:  $(CFG)
         cd $(WXDIR)\src\msw
 
 wxxpm: $(CFG)
-       cd $(WXDIR)\src\common\wxxpm
+       cd $(WXDIR)\src\xpm
        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