moved SEH stuff to crashrpt.cpp

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

diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index b69656843c4e7579248b92c540cc7bc9e201f5da..5eecfbe1aafb51b666b275c579d1b92142ddcd48 100644 (file)
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -14,7 +14,7 @@ WXDIR = ..\..
 
 include ..\makesc.env
 
 
 include ..\makesc.env
 

-DEBUG=0
+DEBUG=1

 
 LIBTARGET = $(LIBDIR)\wx$(SC_SUFFIX).lib
 
 
 LIBTARGET = $(LIBDIR)\wx$(SC_SUFFIX).lib
 


@@ -45,6 +45,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
                $(GENDIR)\progdlgg.obj \
                $(GENDIR)\sashwin.obj \
                $(GENDIR)\scrlwing.obj \
                $(GENDIR)\progdlgg.obj \
                $(GENDIR)\sashwin.obj \
                $(GENDIR)\scrlwing.obj \

+               $(GENDIR)\selstore.obj \

                $(GENDIR)\spinctlg.obj \
                $(GENDIR)\splash.obj \
                $(GENDIR)\splitter.obj \
                $(GENDIR)\spinctlg.obj \
                $(GENDIR)\splash.obj \
                $(GENDIR)\splitter.obj \


@@ -57,6 +58,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
                $(GENDIR)\wizard.obj
 
 COMMONOBJS = $(COMMDIR)\accesscmn.obj \
                $(GENDIR)\wizard.obj
 
 COMMONOBJS = $(COMMDIR)\accesscmn.obj \

+               $(COMMDIR)\appbase.obj \

                $(COMMDIR)\appcmn.obj \
                $(COMMDIR)\artprov.obj \
                $(COMMDIR)\artstd.obj \
                $(COMMDIR)\appcmn.obj \
                $(COMMDIR)\artprov.obj \
                $(COMMDIR)\artstd.obj \


@@ -100,6 +102,8 @@ COMMONOBJS = $(COMMDIR)\accesscmn.obj \
                $(COMMDIR)\filefn.obj \
                $(COMMDIR)\filename.obj \
                $(COMMDIR)\filesys.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 \
                $(COMMDIR)\fontcmn.obj \
                $(COMMDIR)\fontmap.obj \
                $(COMMDIR)\framecmn.obj \


@@ -161,6 +165,7 @@ COMMONOBJS = $(COMMDIR)\accesscmn.obj \
                $(COMMDIR)\sizer.obj \
                $(COMMDIR)\socket.obj \
                $(COMMDIR)\statbar.obj \
                $(COMMDIR)\sizer.obj \
                $(COMMDIR)\socket.obj \
                $(COMMDIR)\statbar.obj \

+               $(COMMDIR)\stopwatch.obj \

                $(COMMDIR)\strconv.obj \
                $(COMMDIR)\stream.obj \
                $(COMMDIR)\string.obj \
                $(COMMDIR)\strconv.obj \
                $(COMMDIR)\stream.obj \
                $(COMMDIR)\string.obj \


@@ -214,6 +219,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\ole\access.obj \
                $(MSWDIR)\app.obj \
                $(MSWDIR)\ole\automtn.obj \
                $(MSWDIR)\ole\access.obj \
                $(MSWDIR)\app.obj \
                $(MSWDIR)\ole\automtn.obj \

+               $(MSWDIR)\basemsw.obj \

                $(MSWDIR)\bitmap.obj \
                $(MSWDIR)\bmpbuttn.obj \
                $(MSWDIR)\brush.obj \
                $(MSWDIR)\bitmap.obj \
                $(MSWDIR)\bmpbuttn.obj \
                $(MSWDIR)\brush.obj \


@@ -316,7 +322,9 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\treectrl.obj \
                $(MSWDIR)\utils.obj \
                $(MSWDIR)\utilsexc.obj \
                $(MSWDIR)\treectrl.obj \
                $(MSWDIR)\utils.obj \
                $(MSWDIR)\utilsexc.obj \

+               $(MSWDIR)\utilsgui.obj \

                $(MSWDIR)\ole\uuid.obj \
                $(MSWDIR)\ole\uuid.obj \

+               $(MSWDIR)\uxtheme.obj \

                $(MSWDIR)\volume.obj \
                $(MSWDIR)\wave.obj \
                $(MSWDIR)\window.obj
                $(MSWDIR)\volume.obj \
                $(MSWDIR)\wave.obj \
                $(MSWDIR)\window.obj


@@ -324,13 +332,14 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) 
 
 # 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
 
 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:
 
 #build our own copies of missing libraries
 MAKELIBS:


@@ -341,7 +350,7 @@ $(LIBTARGET): $(OBJECTS)
        -del $(LIBTARGET)
        *lib /PAGESIZE:512 $(LIBTARGET) y $(OBJECTS), nul;
 
        -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
 
 clean_msw:
        -del $(COMMDIR)\*.obj


@@ -353,6 +362,14 @@ clean_msw:
         -del ole\*.obj
         -del $(LIBTARGET)
 
         -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)
 
 png:   
         make -f $(WXDIR)\src\png\makefile.sc FINAL=$(FINAL)
 


@@ -384,7 +401,6 @@ clean_tiff:
         make -f $(WXDIR)\src\tiff\makefile.sc clean
 
 MFTYPE=sc
         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