X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6244848856584171db8cd74a7ff227250e46cc54..4a9968f92de93e099f698b51fe18058b6c4d0687:/src/msw/makefile.b32

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 341ce0bf04..c9f91fb860 100644
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -76,6 +76,9 @@ GENERICOBJS= \
   $(MSWDIR)\imaglist.obj \
   $(MSWDIR)\laywin.obj \
   $(MSWDIR)\panelg.obj \
+  $(MSWDIR)\prop.obj \
+  $(MSWDIR)\proplist.obj \
+  $(MSWDIR)\propform.obj \
   $(MSWDIR)\sashwin.obj \
   $(MSWDIR)\scrolwin.obj \
   $(MSWDIR)\splitter.obj \
@@ -113,6 +116,7 @@ COMMONOBJS = \
   $(MSWDIR)\log.obj \
   $(MSWDIR)\layout.obj \
   $(MSWDIR)\memory.obj \
+  $(MSWDIR)\mimetype.obj \
   $(MSWDIR)\module.obj \
   $(MSWDIR)\object.obj \
   $(MSWDIR)\postscrp.obj \
@@ -239,6 +243,7 @@ MSWOBJS = \
   $(MSWDIR)\utilsexc.obj \
   $(MSWDIR)\wave.obj \
   $(MSWDIR)\window.obj \
+  $(MSWDIR)\xpmhand.obj \
   $(MSWDIR)\droptgt.obj \
   $(MSWDIR)\dropsrc.obj \
   $(MSWDIR)\oleutils.obj \
@@ -508,6 +513,8 @@ $(MSWDIR)\log.obj:     $(COMMDIR)\log.$(SRCSUFF)
 
 $(MSWDIR)\memory.obj:     $(COMMDIR)\memory.$(SRCSUFF)
 
+$(MSWDIR)\mimetype.obj:     $(COMMDIR)\mimetype.$(SRCSUFF)
+
 $(MSWDIR)\module.obj:     $(COMMDIR)\module.$(SRCSUFF)
 
 $(MSWDIR)\object.obj:     $(COMMDIR)\object.$(SRCSUFF)
@@ -606,6 +613,12 @@ $(MSWDIR)\msgdlgg.obj:     $(GENDIR)\msgdlgg.$(SRCSUFF)
 
 $(MSWDIR)\panelg.obj:     $(GENDIR)\panelg.$(SRCSUFF)
 
+$(MSWDIR)\prop.obj:     $(GENDIR)\prop.$(SRCSUFF)
+
+$(MSWDIR)\proplist.obj:     $(GENDIR)\proplist.$(SRCSUFF)
+
+$(MSWDIR)\propform.obj:     $(GENDIR)\propform.$(SRCSUFF)
+
 $(MSWDIR)\printps.obj:     $(GENDIR)\printps.$(SRCSUFF)
 
 $(MSWDIR)\prntdlgg.obj:     $(GENDIR)\prntdlgg.$(SRCSUFF)
@@ -637,26 +650,16 @@ all_execs:
     make -f makefile.b32 all_execs
     cd $(WXDIR)\src\msw
 
-all_libs:
-    cd $(WXDIR)\src\msw
-    make -f makefile.b32 ctl3d dib fafa gauge hytext itsy prologio rcparser wx wxgraph\
-          wxstring wxtree mfutils # wxxpm
-
-all_contribs:
-    cd $(WXDIR)\src\msw
-    make -f makefile.b32 ctl3d fafa wxstring itsy gauge # wxxpm
-
-# CONTRIB
-ctl3d:  $(CFG)
-        cd $(WXDIR)\src\msw\ctl3d\borland
-        make -f makefile.b32 -DCFG=$(CFG)
-        cd $(WXDIR)\src\msw
-
 wxxpm:	$(CFG)
 	cd $(WXDIR)\src\xpm
 	make -f makefile.b32 -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
 	cd $(WXDIR)\src\msw
 
+clean_wxxpm:	$(CFG)
+	cd $(WXDIR)\src\xpm
+	make -f makefile.b32 clean
+	cd $(WXDIR)\src\msw
+
 png:    $(CFG)
         cd $(WXDIR)\src\png
         make -f makefile.b32 
@@ -688,8 +691,8 @@ $(CFG): makefile.b32
 -w-pia
 -w-aus
 -w-rch
--Oxt
 -WE
+-tWM
 
 -I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/zlib
 -I$(WXDIR)\include\wx\msw\gnuwin32
@@ -705,6 +708,7 @@ $(WIN95FLAG)
 ! $(CFG)
 
 #-I$(WXDIR)\src\common\wxxpm\libxpm.34b\lib
+# -Oxt
 
 clean: $(PERIPH_CLEAN_TARGET)
     erase $(LIBTARGET)