makeg95.env edited for Mingw32/gcc 2.95 compilation; _T not redefined for

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

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 3f39afcacca2e073ea16ab7d212672373880f4a1..87f9c9ac701c13d7c629f3d06c268171261ec6e8 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 19:22, 1999/09/18
+# This file was automatically generated by tmake at 15:31, 1999/10/14
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
@@ -78,8 +78,9 @@ DOCDIR = $(WXDIR)\docs
 
 GENERICOBJS= $(MSWDIR)\busyinfo.obj \
                $(MSWDIR)\choicdgg.obj \
-               $(MSWDIR)\gridg.obj \
+               $(MSWDIR)\grid.obj \
                $(MSWDIR)\laywin.obj \
+               $(MSWDIR)\logg.obj \
                $(MSWDIR)\numdlgg.obj \
                $(MSWDIR)\panelg.obj \
                $(MSWDIR)\progdlgg.obj \
@@ -129,6 +130,7 @@ COMMONOBJS = \
                $(MSWDIR)\fileconf.obj \
                $(MSWDIR)\filefn.obj \
                $(MSWDIR)\filesys.obj \
+               $(MSWDIR)\fontcmn.obj \
                $(MSWDIR)\framecmn.obj \
                $(MSWDIR)\fs_inet.obj \
                $(MSWDIR)\fs_zip.obj \
@@ -138,6 +140,7 @@ COMMONOBJS = \
                $(MSWDIR)\hash.obj \
                $(MSWDIR)\helpbase.obj \
                $(MSWDIR)\http.obj \
+               $(MSWDIR)\imagall.obj \
                $(MSWDIR)\imagbmp.obj \
                $(MSWDIR)\image.obj \
                $(MSWDIR)\imaggif.obj \
@@ -145,6 +148,7 @@ COMMONOBJS = \
                $(MSWDIR)\imagpcx.obj \
                $(MSWDIR)\imagpng.obj \
                $(MSWDIR)\imagpnm.obj \
+               $(MSWDIR)\init.obj \
                $(MSWDIR)\intl.obj \
                $(MSWDIR)\ipcbase.obj \
                $(MSWDIR)\layout.obj \
@@ -410,7 +414,7 @@ $(MSWDIR)\gauge95.obj: $(MSWDIR)\gauge95.$(SRCSUFF)
 
 $(MSWDIR)\gdiobj.obj: $(MSWDIR)\gdiobj.$(SRCSUFF)
 
-$(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.$(SRCSUFF)
+$(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.c
 
 $(MSWDIR)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF)
 
@@ -561,6 +565,8 @@ $(MSWDIR)\filefn.obj: $(COMMDIR)\filefn.$(SRCSUFF)
 
 $(MSWDIR)\filesys.obj: $(COMMDIR)\filesys.$(SRCSUFF)
 
+$(MSWDIR)\fontcmn.obj: $(COMMDIR)\fontcmn.$(SRCSUFF)
+
 $(MSWDIR)\framecmn.obj: $(COMMDIR)\framecmn.$(SRCSUFF)
 
 $(MSWDIR)\fs_inet.obj: $(COMMDIR)\fs_inet.$(SRCSUFF)
@@ -579,6 +585,8 @@ $(MSWDIR)\helpbase.obj: $(COMMDIR)\helpbase.$(SRCSUFF)
 
 $(MSWDIR)\http.obj: $(COMMDIR)\http.$(SRCSUFF)
 
+$(MSWDIR)\imagall.obj: $(COMMDIR)\imagall.$(SRCSUFF)
+
 $(MSWDIR)\imagbmp.obj: $(COMMDIR)\imagbmp.$(SRCSUFF)
 
 $(MSWDIR)\image.obj: $(COMMDIR)\image.$(SRCSUFF)
@@ -593,6 +601,8 @@ $(MSWDIR)\imagpng.obj: $(COMMDIR)\imagpng.$(SRCSUFF)
 
 $(MSWDIR)\imagpnm.obj: $(COMMDIR)\imagpnm.$(SRCSUFF)
 
+$(MSWDIR)\init.obj: $(COMMDIR)\init.$(SRCSUFF)
+
 $(MSWDIR)\intl.obj: $(COMMDIR)\intl.$(SRCSUFF)
 
 $(MSWDIR)\ipcbase.obj: $(COMMDIR)\ipcbase.$(SRCSUFF)
@@ -699,10 +709,12 @@ $(MSWDIR)\busyinfo.obj: $(GENDIR)\busyinfo.$(SRCSUFF)
 
 $(MSWDIR)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF)
 
-$(MSWDIR)\gridg.obj: $(GENDIR)\gridg.$(SRCSUFF)
+$(MSWDIR)\grid.obj: $(GENDIR)\grid.$(SRCSUFF)
 
 $(MSWDIR)\laywin.obj: $(GENDIR)\laywin.$(SRCSUFF)
 
+$(MSWDIR)\logg.obj: $(GENDIR)\logg.$(SRCSUFF)
+
 $(MSWDIR)\numdlgg.obj: $(GENDIR)\numdlgg.$(SRCSUFF)
 
 $(MSWDIR)\panelg.obj: $(GENDIR)\panelg.$(SRCSUFF)
@@ -831,7 +843,10 @@ cleanall: clean
 
 
 MFTYPE=b32
-makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+# Can't use this or we'll have to distribute all tmake files with wxWindows
+# makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+
+self:
        cd $(WXWIN)\distrib\msw\tmake
        tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
        copy makefile.$(MFTYPE) $(WXWIN)\src\msw