use specific linker flags under Mac OS X when linking executables against the

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

diff --git a/distrib/msw/tmake/wat.t b/distrib/msw/tmake/wat.t
index bd4895007ca26a8ee1766b46b46f0fe99fb8aebb..e6d9f58f73df2a00f90e4e2f8150916052ee8886 100644 (file)
--- a/distrib/msw/tmake/wat.t
+++ b/distrib/msw/tmake/wat.t
@@ -28,8 +28,17 @@
         $file =~ s/cp?p?$/obj/;
         $project{$tag} .= $file . " "
     }
         $file =~ s/cp?p?$/obj/;
         $project{$tag} .= $file . " "
     }

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

 
     foreach $file (sort keys %wxCommon) {
 
     foreach $file (sort keys %wxCommon) {

+        next if $wxCommon{$file} =~ /\b(16|U)\b/;
+

         $isCFile = $file =~ /\.c$/;
         $file =~ s/cp?p?$/obj/;
         $project{"WXCOMMONOBJS"} .= $file . " ";
         $isCFile = $file =~ /\.c$/;
         $file =~ s/cp?p?$/obj/;
         $project{"WXCOMMONOBJS"} .= $file . " ";


@@ -53,7 +62,7 @@
 #! an attempt to embed '#' directly in the string somehow didn't work...
 #$ $text = chr(35) . '!/binb/wmake.exe';
 
 #! an attempt to embed '#' directly in the string somehow didn't work...
 #$ $text = chr(35) . '!/binb/wmake.exe';
 

-# This file was automatically generated by tmake at #$ Now()
+# This file was automatically generated by tmake 

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #


@@ -82,14 +91,15 @@ LIBTARGET   = $(WXLIB)\wx.lib
 DUMMY=dummydll
 # ODBCLIB     = ..\..\contrib\odbc\odbc32.lib
 
 DUMMY=dummydll
 # ODBCLIB     = ..\..\contrib\odbc\odbc32.lib
 

-EXTRATARGETS = png zlib jpeg tiff
-EXTRATARGETSCLEAN = clean_png clean_zlib clean_jpeg clean_tiff
+EXTRATARGETS = png zlib jpeg tiff regex
+EXTRATARGETSCLEAN = clean_png clean_zlib clean_jpeg clean_tiff clean_regex

 GENDIR=$(WXDIR)\src\generic
 COMMDIR=$(WXDIR)\src\common
 JPEGDIR=$(WXDIR)\src\jpeg
 TIFFDIR=$(WXDIR)\src\tiff
 MSWDIR=$(WXDIR)\src\msw
 OLEDIR=$(MSWDIR)\ole
 GENDIR=$(WXDIR)\src\generic
 COMMDIR=$(WXDIR)\src\common
 JPEGDIR=$(WXDIR)\src\jpeg
 TIFFDIR=$(WXDIR)\src\tiff
 MSWDIR=$(WXDIR)\src\msw
 OLEDIR=$(MSWDIR)\ole

+HTMLDIR=$(WXDIR)\src\html

 
 DOCDIR = $(WXDIR)\docs
 
 
 DOCDIR = $(WXDIR)\docs
 


@@ -105,10 +115,22 @@ COMMONOBJS = &
 
 MSWOBJS = #$ ExpandGlue("WXMSWOBJS", "", " &\n\t")
 
 
 MSWOBJS = #$ ExpandGlue("WXMSWOBJS", "", " &\n\t")
 

+HTMLOBJS = #$ ExpandGlue("WXHTMLOBJS", "", " &\n\t")
+

 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.

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

 
 

-all:        $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS)
+ARCHINCDIR=$(WXDIR)\lib\msw
+SETUP_H=$(ARCHINCDIR)\wx\setup.h
+
+all:        $(SETUP_H) $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC
+
+$(ARCHINCDIR)\wx:
+    mkdir $(ARCHINCDIR)
+    mkdir $(ARCHINCDIR)\wx
+
+$(SETUP_H): $(WXDIR)\include\wx\msw\setup.h $(ARCHINCDIR)\wx
+    copy $(WXDIR)\include\wx\msw\setup.h $@

 
 $(LIBTARGET) : $(OBJECTS)
     %create tmp.lbc
 
 $(LIBTARGET) : $(OBJECTS)
     %create tmp.lbc


@@ -206,54 +228,21 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     }
 #$}
 
     }
 #$}
 

-OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
-  trees$(O)
-OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \
-  infutil$(O) inffast$(O)
-
-adler32.obj: adler32.c zutil.h zlib.h zconf.h
-       $(CC) -c $(CFLAGS) $*.c
-
-compress.obj: compress.c zlib.h zconf.h
-       $(CC) -c $(CFLAGS) $*.c
-
-crc32.obj: crc32.c zutil.h zlib.h zconf.h
-       $(CC) -c $(CFLAGS) $*.c
-
-deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
-       $(CC) -c $(CFLAGS) $*.c
-
-gzio.obj: gzio.c zutil.h zlib.h zconf.h
-       $(CC) -c $(CFLAGS) $*.c
-
-infblock.obj: infblock.c zutil.h zlib.h zconf.h infblock.h inftrees.h\
-   infcodes.h infutil.h
-       $(CC) -c $(CFLAGS) $*.c
-
-infcodes.obj: infcodes.c zutil.h zlib.h zconf.h inftrees.h infutil.h\
-   infcodes.h inffast.h
-       $(CC) -c $(CFLAGS) $*.c
-
-inflate.obj: inflate.c zutil.h zlib.h zconf.h infblock.h
-       $(CC) -c $(CFLAGS) $*.c
-
-inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
-       $(CC) -c $(CFLAGS) $*.c
-
-infutil.obj: infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h
-       $(CC) -c $(CFLAGS) $*.c

 
 

-inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
-       $(CC) -c $(CFLAGS) $*.c
-
-trees.obj: trees.c deflate.h zutil.h zlib.h zconf.h
-       $(CC) -c $(CFLAGS) $*.c
-
-uncompr.obj: uncompr.c zlib.h zconf.h
-       $(CC) -c $(CFLAGS) $*.c
+########################################################
+# HTML objects (always compiled)

 
 

-zutil.obj: zutil.c zutil.h zlib.h zconf.h
-       $(CC) -c $(CFLAGS) $*.c
+#${
+    $_ = $project{"WXHTMLOBJS"};
+    my @objs = split;
+    foreach (@objs) {
+        $text .= $_;
+        s/\.obj$//;
+        $text .= ':     $(HTMLDIR)\\';
+        $text .= $_ . ".cpp\n" .
+                 '  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<' . "\n\n";
+    }
+#$}

 
 png:   .SYMBOLIC
     cd $(WXDIR)\src\png
 
 png:   .SYMBOLIC
     cd $(WXDIR)\src\png


@@ -295,6 +284,16 @@ clean_tiff:   .SYMBOLIC
     wmake -f makefile.wat clean
     cd $(WXDIR)\src\msw
 
     wmake -f makefile.wat clean
     cd $(WXDIR)\src\msw
 

+regex:    .SYMBOLIC
+    cd $(WXDIR)\src\regex
+    wmake -f makefile.wat all
+    cd $(WXDIR)\src\msw
+
+clean_regex:   .SYMBOLIC
+    cd $(WXDIR)\src\regex
+    wmake -f makefile.wat clean
+    cd $(WXDIR)\src\msw
+

 MFTYPE=wat
 self : .SYMBOLIC $(WXDIR)\distrib\msw\tmake\filelist.txt $(WXDIR)\distrib\msw\tmake\$(MFTYPE).t
        cd $(WXDIR)\distrib\msw\tmake
 MFTYPE=wat
 self : .SYMBOLIC $(WXDIR)\distrib\msw\tmake\filelist.txt $(WXDIR)\distrib\msw\tmake\$(MFTYPE).t
        cd $(WXDIR)\distrib\msw\tmake