X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2dcd33c2581e5470caf5fa37fad97c13ddf950cb..02d5015b1cbb99d7a2e2ab7818cd46b2b4514957:/distrib/msw/tmake/b32base.t?ds=sidebyside

diff --git a/distrib/msw/tmake/b32base.t b/distrib/msw/tmake/b32base.t
index c80f5de01d..11854c5d5d 100644
--- a/distrib/msw/tmake/b32base.t
+++ b/distrib/msw/tmake/b32base.t
@@ -18,7 +18,7 @@
 
         $isCFile = $file =~ /\.c$/;
         $file =~ s/cp?p?$/obj/;
-        $obj = "\$(MSWDIR)\\" . $file . " ";
+        $obj = "\$(OBJ_PATH)\\" . $file . " ";
         $project{"WXCOMMONOBJS"} .= $obj;
         $project{"WXCOBJS"} .= $obj if $isCFile;
     }
@@ -30,7 +30,7 @@
 
         my $isOleObj = $wxMSW{$file} =~ /\bO\b/;
         $file =~ s/cp?p?$/obj/;
-        my $obj = "\$(MSWDIR)\\" . $file . " ";
+        my $obj = "\$(OBJ_PATH)\\" . $file . " ";
 
         $project{"WXMSWOBJS"} .= $obj;
         if ( $isOleObj ) {
@@ -43,7 +43,7 @@
     foreach $file (sort keys %wxBase) {
         $isCFile = $file =~ /\.c$/;
         $file =~ s/cp?p?$/obj/;
-        $project{"WXCOMMONOBJS"} .= "\$(MSWDIR)\\" . $file . " ";
+        $project{"WXCOMMONOBJS"} .= "\$(OBJ_PATH)\\" . $file . " ";
         $project{"WXCOBJS"} .= $obj if $isCFile;
     }
 #$}
@@ -85,14 +85,14 @@ wxUSE_GUI=0
 !include $(WXDIR)\src\makeb32.env
 
 PERIPH_LIBS=
-PERIPH_TARGET=zlib png jpeg tiff regex $(PERIPH_TARGET)
-PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff clean_regex $(PERIPH_CLEAN_TARGET)
+PERIPH_TARGET=zlib regex $(PERIPH_TARGET)
+PERIPH_CLEAN_TARGET=clean_zlib clean_regex $(PERIPH_CLEAN_TARGET)
 
 !if "$(DLL)" == "0"
 DUMMY=dummy
 !else
 DUMMY=dummydll
-LIBS= cw32mti import32 ole2w32 odbc32 zlib winpng jpeg tiff regex
+LIBS= cw32mti import32 ole2w32 odbc32 zlib regex
 !endif
 
 LIBTARGET=$(WXLIB)
@@ -106,7 +106,6 @@ MSWDIR=.
 DOCDIR = $(WXDIR)\docs
 
 COMMONOBJS = \
-    $(MSWDIR)\y_tab.obj \
     #$ ExpandList("WXCOMMONOBJS");
 
 MSWOBJS = #$ ExpandList("WXMSWOBJS");
@@ -115,10 +114,13 @@ OBJECTS = $(COMMONOBJS) $(MSWOBJS)
 
 default:    wx
 
-wx:    $(ARCHINCDIR)\wx makesetuph makearchsetuph $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+wx:    $(ARCHINCDIR)\wx makesetuph makearchsetuph makeoutdir $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
 
 all:    wx
 
+makeoutdir:
+    -mkdir $(OBJ_PATH)
+
 # Copy the in-CVS setup0.h to setup.h if necessary
 makesetuph:
      cd $(WXDIR)\include\wx\msw
@@ -164,27 +166,16 @@ dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\includ
 version.res:
     brc32 -r -i$(WXDIR)\include\ $(MSWDIR)\version.rc
 
-$(MSWDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
-
-#        cl @<<
-# $(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
-# <<
-
-$(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
-
-
 #${
     $_ = $project{"WXMSWOBJS"};
     my @objs = split;
     foreach (@objs) {
         $text .= $_ . ": ";
-        if ( $project{"WXOLEOBJS"} =~ /\Q$_/ ) { s/MSWDIR/OLEDIR/; }
         $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
         s/obj$/$suffix/;
+        s/OBJ_PATH/MSWDIR/;
+        if ( $project{"WXOLEOBJS"} =~ /\Q$_/ ) { s/MSWDIR/OLEDIR/; }
+ 
         $text .= $_ . "\n\n";
     }
 #$}
@@ -198,7 +189,7 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     foreach (@objs) {
         $text .= $_ . ": ";
         $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
-        s/MSWDIR/COMMDIR/;
+        s/OBJ_PATH/COMMDIR/;
         s/obj$/$suffix/;
         $text .= $_ . "\n\n";
     }
@@ -220,15 +211,7 @@ all_execs:
     ${MAKE} -f makefile.b32 all_execs
     cd $(WXDIR)\src\msw
 
-png:    $(CFG)
-        cd $(WXDIR)\src\png
-        ${MAKE} -f makefile.b32 wxUSE_GUI=0
-        cd $(WXDIR)\src\msw
 
-clean_png:
-        cd $(WXDIR)\src\png
-        ${MAKE} -f makefile.b32 clean
-        cd $(WXDIR)\src\msw
 
 zlib:   $(CFG)
         cd $(WXDIR)\src\zlib
@@ -240,15 +223,6 @@ clean_zlib:
         ${MAKE} -f makefile.b32 clean
         cd $(WXDIR)\src\msw
 
-jpeg:    $(CFG)
-        cd $(WXDIR)\src\jpeg
-        ${MAKE} -f makefile.b32 wxUSE_GUI=0
-        cd $(WXDIR)\src\msw
-
-clean_jpeg:
-        cd $(WXDIR)\src\jpeg
-        ${MAKE} -f makefile.b32 clean
-        cd $(WXDIR)\src\msw
 
 regex:   $(CFG)
         cd $(WXDIR)\src\regex
@@ -260,15 +234,7 @@ clean_regex:
         ${MAKE} -f makefile.b32 clean
         cd $(WXDIR)\src\msw
 
-tiff:   $(CFG)
-        cd $(WXDIR)\src\tiff
-        ${MAKE} -f makefile.b32 wxUSE_GUI=0 lib
-        cd $(WXDIR)\src\msw
 
-clean_tiff:
-        cd $(WXDIR)\src\tiff
-        ${MAKE} -f makefile.b32 clean
-        cd $(WXDIR)\src\msw
 
 $(CFG): makebase.b32
     copy &&!
@@ -299,18 +265,21 @@ $(WIN95FLAG)
 ! $(CFG)
 
 clean: $(PERIPH_CLEAN_TARGET)
-    -erase $(WXLIBDIR)\wx.tds
-    -erase $(WXLIBDIR)\wx.il?
-    -erase *.obj
-    -erase *.pch
-    -erase *.csm
-    -erase "wx32.#??"
-    -erase ..\common\y_tab.c
-    -erase ..\common\lex_yy.c
+    -$(RM) $(WXLIBDIR)\*.tds
+    -$(RM) $(WXLIBDIR)\*.il?
+    -$(RM) $(OBJ_PATH)\*.obj
+    -$(RM) $(OBJ_PATH)\*.pch
+    -$(RM) $(OBJ_PATH)\*.csm
+    -$(RM) $(OBJ_PATH)\"wx32.#??"
+
+cleancfg:
+    -$(RM) $(OBJ_PATH)\*.cfg
+
+
+cleanall: clean cleancfg
 
-cleanall: clean
 
 self:
     cd $(WXWIN)\distrib\msw\tmake
-    tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
-    copy makefile.$(MFTYPE) $(WXWIN)\src\msw
+    perl -S tmake -tb32base wxwin.pro -o makebase.b32
+    copy makebase.b32 $(WXWIN)\src\msw