compilation fix

[wxWidgets.git] / distrib / msw / tmake / sc.t

diff --git a/distrib/msw/tmake/sc.t b/distrib/msw/tmake/sc.t
index b3a6730f1a79067acc8405c54a023f2370e9feff..8e88b031289e64e75e7a72f2b06970e03c26a766 100644 (file)
--- a/distrib/msw/tmake/sc.t
+++ b/distrib/msw/tmake/sc.t
@@ -26,6 +26,13 @@
         $project{$tag} .= '$(GENDIR)\\' . $file . " "
     }
 
         $project{$tag} .= '$(GENDIR)\\' . $file . " "
     }
 

+    foreach $file (sort keys %wxHTML) {
+        next if $wxHTML{$file} =~ /\b16\b/;
+
+        $file =~ s/cp?p?$/obj/;
+        $project{"WXHTMLOBJS"} .= '$(HTMLDIR)\\' . $file . " "
+    }
+

     foreach $file (sort keys %wxCommon) {
         next if $wxCommon{$file} =~ /\b(16|U)\b/;
 
     foreach $file (sort keys %wxCommon) {
         next if $wxCommon{$file} =~ /\b(16|U)\b/;
 


@@ -35,7 +42,7 @@
 
     foreach $file (sort keys %wxMSW) {
         #! these files don't compile with SC++ 6
 
     foreach $file (sort keys %wxMSW) {
         #! these files don't compile with SC++ 6

-        next if $file =~ /^(joystick|pnghand)\./;
+        #! next if $file =~ /^(joystick|pnghand)\./;

 
         next if $wxMSW{$file} =~ /\b16\b/;
 
 
         next if $wxMSW{$file} =~ /\b16\b/;
 


@@ -50,12 +57,14 @@
 # This file was automatically generated by tmake 
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
 # This file was automatically generated by tmake 
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 

-# Symantec C++ makefile for the msw objects
+# Digital mars makefile 
+# was Symantec C++ makefile for the msw objects
+#

 # called from src\makefile.sc
 
 # configuration section (see src\makefile.sc) ###########################
 
 # called from src\makefile.sc
 
 # configuration section (see src\makefile.sc) ###########################
 

-WXDIR = $(WXWIN)
+WXDIR = ..\..

 
 include ..\makesc.env
 
 
 include ..\makesc.env
 


@@ -69,52 +78,90 @@ OPTIONS=
 
 GENDIR=$(WXDIR)\src\generic
 COMMDIR=$(WXDIR)\src\common
 
 GENDIR=$(WXDIR)\src\generic
 COMMDIR=$(WXDIR)\src\common

+HTMLDIR=$(WXDIR)\src\html

 OLEDIR=ole
 MSWDIR=$(WXDIR)\src\msw
 
 GENERICOBJS= #$ ExpandList("WXGENERICOBJS");
 
 OLEDIR=ole
 MSWDIR=$(WXDIR)\src\msw
 
 GENERICOBJS= #$ ExpandList("WXGENERICOBJS");
 

-COMMONOBJS = \
-               $(COMMDIR)\y_tab.obj \
-               #$ ExpandList("WXCOMMONOBJS");
+COMMONOBJS = #$ ExpandList("WXCOMMONOBJS");
+
+HTMLOBJS = #$ ExpandList ("WXHTMLOBJS");

 
 MSWOBJS = #$ ExpandList("WXMSWOBJS");
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 
 MSWOBJS = #$ ExpandList("WXMSWOBJS");
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.

-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) 

 
 

-all: MAKEARCHDIR $(LIBTARGET)
+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:
+      implib  /s $(LIBDIR)\$(SHELLLIB) $(LIBDIR)\$(SC_SUFFIX)\$(SHELLLIB).def
+      implib  /s $(LIBDIR)\$(WINSOCKLIB) $(LIBDIR)\$(SC_SUFFIX)\$(WINSOCKLIB).def

 
 $(LIBTARGET): $(OBJECTS)
        -del $(LIBTARGET)
        *lib /PAGESIZE:512 $(LIBTARGET) y $(OBJECTS), nul;
 
 
 $(LIBTARGET): $(OBJECTS)
        -del $(LIBTARGET)
        *lib /PAGESIZE:512 $(LIBTARGET) y $(OBJECTS), nul;
 

-clean:
+clean: clean_msw clean_zlib clean_png clean_jpeg clean_tiff clean_regex clean_pch
+
+clean_msw:

        -del $(COMMDIR)\*.obj
        -del $(MSWDIR)\*.obj
        -del $(GENDIR)\*.obj
        -del $(COMMDIR)\*.obj
        -del $(MSWDIR)\*.obj
        -del $(GENDIR)\*.obj

+        -del $(HTMLDIR)\*.obj

        -del *.obj
        -del *.obj

-    -del $(LIBTARGET)
-
-## $(COMMDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
-##
-## $(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
-##        copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
-##
-## $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
-##    copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
-##
-### $(COMMDIR)\cmndata.obj:     $(COMMDIR)\cmndata.cpp
-###    *$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) $(COMMDIR)\cmndata.cpp -o$(COMMDIR)\cmndata.obj
+        -del *.sym
+        -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)
+
+clean_png:
+        make -f $(WXDIR)\src\png\makefile.sc clean
+
+zlib:   
+        make -f $(WXDIR)\src\zlib\makefile.sc FINAL=$(FINAL) 
+
+clean_zlib:
+        make -f $(WXDIR)\src\zlib\makefile.sc clean
+
+jpeg:   
+        make -f $(WXDIR)\src\jpeg\makefile.sc FINAL=$(FINAL)
+
+clean_jpeg:
+        make -f $(WXDIR)\src\jpeg\makefile.sc clean
+
+regex:  
+        make -f $(WXDIR)\src\regex\makefile.sc FINAL=$(FINAL) 
+
+clean_regex:
+        make -f $(WXDIR)\src\regex\makefile.sc clean
+
+tiff:  
+        make -f $(WXDIR)\src\tiff\makefile.sc FINAL=$(FINAL) 
+
+clean_tiff:
+        make -f $(WXDIR)\src\tiff\makefile.sc clean

 
 MFTYPE=sc
 
 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