wxMediaCtrl patch from Ryan:

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

diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 2a967cffc80bc11d0aaf6c06465c8c84d8a053a0..35402f14531f3fe3f211589b9c2262aa1bfa749c 100644 (file)
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -43,6 +43,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
                $(GENDIR)\numdlgg.obj \
                $(GENDIR)\panelg.obj \
                $(GENDIR)\progdlgg.obj \
+               $(GENDIR)\renderg.obj \
                $(GENDIR)\sashwin.obj \
                $(GENDIR)\scrlwing.obj \
                $(GENDIR)\selstore.obj \
@@ -50,7 +51,6 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
                $(GENDIR)\splash.obj \
                $(GENDIR)\splitter.obj \
                $(GENDIR)\statusbr.obj \
-               $(GENDIR)\tbarsmpl.obj \
                $(GENDIR)\textdlgg.obj \
                $(GENDIR)\tipdlg.obj \
                $(GENDIR)\tipwin.obj \
@@ -58,9 +58,11 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
                $(GENDIR)\wizard.obj
 
 COMMONOBJS = $(COMMDIR)\accesscmn.obj \
+               $(COMMDIR)\appbase.obj \
                $(COMMDIR)\appcmn.obj \
                $(COMMDIR)\artprov.obj \
                $(COMMDIR)\artstd.obj \
+                $(COMMDIR)\bookctrl.obj \
                $(COMMDIR)\choiccmn.obj \
                $(COMMDIR)\clipcmn.obj \
                $(COMMDIR)\clntdata.obj \
@@ -101,6 +103,8 @@ COMMONOBJS = $(COMMDIR)\accesscmn.obj \
                $(COMMDIR)\filefn.obj \
                $(COMMDIR)\filename.obj \
                $(COMMDIR)\filesys.obj \
+               $(COMMDIR)\fldlgcmn.obj \
+               $(COMMDIR)\fmapbase.obj \
                $(COMMDIR)\fontcmn.obj \
                $(COMMDIR)\fontmap.obj \
                $(COMMDIR)\framecmn.obj \
@@ -130,6 +134,7 @@ COMMONOBJS = $(COMMDIR)\accesscmn.obj \
                $(COMMDIR)\imagtiff.obj \
                $(COMMDIR)\imagxpm.obj \
                $(COMMDIR)\intl.obj \
+               $(COMMDIR)\init.obj \
                $(COMMDIR)\ipcbase.obj \
                $(COMMDIR)\layout.obj \
                $(COMMDIR)\lboxcmn.obj \
@@ -153,6 +158,7 @@ COMMONOBJS = $(COMMDIR)\accesscmn.obj \
                $(COMMDIR)\quantize.obj \
                $(COMMDIR)\radiocmn.obj \
                $(COMMDIR)\regex.obj \
+               $(COMMDIR)\rendcmn.obj  \
                $(COMMDIR)\rgncmn.obj \
                $(COMMDIR)\sckaddr.obj \
                $(COMMDIR)\sckfile.obj \
@@ -162,6 +168,7 @@ COMMONOBJS = $(COMMDIR)\accesscmn.obj \
                $(COMMDIR)\sizer.obj \
                $(COMMDIR)\socket.obj \
                $(COMMDIR)\statbar.obj \
+               $(COMMDIR)\stopwatch.obj \
                $(COMMDIR)\strconv.obj \
                $(COMMDIR)\stream.obj \
                $(COMMDIR)\string.obj \
@@ -215,6 +222,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\ole\access.obj \
                $(MSWDIR)\app.obj \
                $(MSWDIR)\ole\automtn.obj \
+               $(MSWDIR)\basemsw.obj \
                $(MSWDIR)\bitmap.obj \
                $(MSWDIR)\bmpbuttn.obj \
                $(MSWDIR)\brush.obj \
@@ -293,6 +301,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\radiobut.obj \
                $(MSWDIR)\regconf.obj \
                $(MSWDIR)\region.obj \
+               $(MSWDIR)\renderer.obj \
                $(MSWDIR)\registry.obj \
                $(MSWDIR)\scrolbar.obj \
                $(MSWDIR)\settings.obj \
@@ -317,6 +326,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\treectrl.obj \
                $(MSWDIR)\utils.obj \
                $(MSWDIR)\utilsexc.obj \
+               $(MSWDIR)\utilsgui.obj \
                $(MSWDIR)\ole\uuid.obj \
                $(MSWDIR)\uxtheme.obj \
                $(MSWDIR)\volume.obj \
@@ -326,24 +336,26 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) 
 
-all: MAKEARCHDIR MAKELIBS $(LIBTARGET) zlib png jpeg tiff regex
+all: MAKEARCHDIR MAKELIBS PCH $(LIBTARGET) zlib png jpeg tiff regex
 
 MAKEARCHDIR:
     @if not exist $(MSWINCDIR)\setup.h copy $(MSWINCDIR)\setup0.h $(MSWINCDIR)\setup.h
     @if not exist $(ARCHINCDIR)\wx\setup.h mkdir $(ARCHINCDIR)
     @if not exist $(ARCHINCDIR)\wx\setup.h mkdir $(ARCHINCDIR)\wx
     @if not exist $(ARCHINCDIR)\wx\setup.h copy $(MSWINCDIR)\setup.h $(ARCHINCDIR)\wx\setup.h
+    @if not exist $(WXOUTDIR)\nul mkdir $(WXOUTDIR)
 
 #build our own copies of missing libraries
 MAKELIBS:
       implib  /s $(LIBDIR)\$(SHELLLIB) $(LIBDIR)\$(SC_SUFFIX)\$(SHELLLIB).def
       implib  /s $(LIBDIR)\$(WINSOCKLIB) $(LIBDIR)\$(SC_SUFFIX)\$(WINSOCKLIB).def
+      implib  /s $(LIBDIR)\$(WINMMLIB) $(LIBDIR)\$(SC_SUFFIX)\$(WINMMLIB).def
 
 $(LIBTARGET): $(OBJECTS)
        -del $(LIBTARGET)
        *lib /PAGESIZE:512 $(LIBTARGET) y $(OBJECTS), nul;
 
-clean: clean_msw clean_zlib clean_png clean_jpeg clean_tiff clean_regex
+clean: clean_msw clean_zlib clean_png clean_jpeg clean_tiff clean_regex clean_pch
 
 clean_msw:
        -del $(COMMDIR)\*.obj
@@ -355,6 +367,14 @@ clean_msw:
         -del ole\*.obj
         -del $(LIBTARGET)
 
+PCH: $(INCDIR)\wx\wxprec.h
+        dmc $(CPPFLAGS) $(CFLAGS) $(INCLUDE) -HF$(WXOUTDIR)\wxprec.SYM -o$(WXOUTDIR)\wxprec.PCO $(INCDIR)\wx\wxprec.h
+
+clean_pch:
+        del $(WXOUTDIR)\*.sym
+        del $(WXOUTDIR)\*.PCO
+
+
 png:   
         make -f $(WXDIR)\src\png\makefile.sc FINAL=$(FINAL)
 
@@ -386,7 +406,6 @@ clean_tiff:
         make -f $(WXDIR)\src\tiff\makefile.sc clean
 
 MFTYPE=sc
-makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
-       cd $(WXWIN)\distrib\msw\tmake
-       tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
-       copy makefile.$(MFTYPE) $(WXWIN)\src\msw
+self : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+       perl -x$(WXWIN)\distrib\msw\tmake -S tmake -t$(MFTYPE) wxwin.pro -o $(WXWIN)\distrib\msw\tmake\makefile.sc
+       copy $(WXWIN)\distrib\msw\tmake\makefile.$(MFTYPE) $(WXWIN)\src\msw