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

Mingw32; removed init.cpp from makefile.vc (tmake keeps generating it);
added spinctrl.cpp to MSW section in filelist.txt.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/makeg95.env

@@ -20,7 +20,7 @@
 # For AIX/CSet++: use CC = xlC
 # For IRIX: use CC = CC
 # CC = gcc-2.6.2
-CC = gcc
+CC = gcc --pipe -fvtable-thunks
 
 # C compiler for pure C programs
 # Typical: CC=g++ , CCC=gcc
@@ -55,8 +55,7 @@ RESFLAGS=$(RCINCSWITCH) $(WXDIR)/include $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH)
 
 # Miscellaneous compiler options
 # GRG: The __EGCS__ symbol is not needed anymore!
-OPTIONS= -D__MINGW32__  -DSTRICT # -D__EGCS__
-
+OPTIONS= -DSTRICT # -D__MINGW32__ # -D__EGCS__
 
 # Debugging information
 # AIX: comment out.
@@ -106,27 +105,30 @@ OPT = -fno-pcc-struct-return -O2 -fno-rtti -fno-exceptions
 AROPTIONS = ruv
 RANLIB = ranlib
 
-# Compiler libraries: defaults to GCC libraries
-#COMPLIBS=-lg++
-#for win95
-#COMPLIBS=-lgcc
+# Extra compiler libraries
+COMPLIBS=
 
 # Compiler or system-specific include paths
 COMPPATHS=
 
 ########################## Directories ###############################
 
-
 WINLIBS=-lstdc++ -lgcc \
 	-lwinspool -lwinmm -lshell32 \
-    -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 -lwsock32 # -loldnames
+	-lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 \
+	-lole32 -loleaut32 -luuid \
+	-lodbc32 -lwsock32#  -loldnames
+
+#WINLIBS=-lstdc++ -lgcc \
+#	-lwinspool -lwinmm -lshell32 \
+#    -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 -lwsock32 # -loldnames
 
 # Shouldn't need to change these...
 WXSRC=$(WXDIR)/src/msw
 WXINC=$(WXDIR)/include
 WXBASESRC=$(WXDIR)/src/common
 WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx.$(LIBSUFF)
-INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/include/wx/msw/gnuwin32 -I$(WXDIR)/src/zlib $(EXTRAINC) $(COMPPATHS)
+INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib $(EXTRAINC) $(COMPPATHS) # -I$(WXDIR)/include/wx/msw/gnuwin32 
 RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)/include"
 
 #LIBS = -lctl3d32 $(WXLIB) $(WINLIBS) $(COMPLIBS)

src/makeprog.g95

@@ -20,9 +20,9 @@ $(TARGET)_resources.o:  $(TARGET).rc
 	$(RESCOMP) $(RCINPUTSWITCH) $(TARGET).rc $(RCOUTPUTSWITCH) $(TARGET)_resources.o $(RESFLAGS)
 
 clean:
-	erase *.o
-	erase $(TARGET)_resources.o
-	erase $(TARGET).exe 
-	erase core 
-	erase *.rsc
-	erase *.res
+	rm -f *.o
+	rm -f $(TARGET)_resources.o
+	rm -f $(TARGET).exe 
+	rm -f core 
+	rm -f *.rsc
+	rm -f *.res

src/msw/makefile.g95

@@ -399,21 +399,21 @@ $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
 #	mv y.tab.c $(COMMDIR)/y_tab.c
 
 clean:
-	-erase *.o
-	-erase *.bak
-	-erase core
-	-erase ..\common\y_tab.c
-	-erase ..\common\lex_yy.c
-	-erase ..\common\*.o
-	-erase ..\common\*.bak
-	-erase ..\generic\*.o
-	-erase ..\generic\*.bak
-	-erase ..\html\*.o
-	-erase ..\png\*.o
-	-erase ..\png\*.bak
-	-erase ..\zlib\*.o
-	-erase ..\zlib\*.bak
-	-erase ..\jpeg\*.o
-	-erase ..\..\lib\libwx.a
+	rm -f *.o
+	rm -f *.bak
+	rm -f core
+	rm -f ..\common\y_tab.c
+	rm -f ..\common\lex_yy.c
+	rm -f ..\common\*.o
+	rm -f ..\common\*.bak
+	rm -f ..\generic\*.o
+	rm -f ..\generic\*.bak
+	rm -f ..\html\*.o
+	rm -f ..\png\*.o
+	rm -f ..\png\*.bak
+	rm -f ..\zlib\*.o
+	rm -f ..\zlib\*.bak
+	rm -f ..\jpeg\*.o
+	rm -f ..\..\lib\libwx.a
 
 cleanall: clean

src/msw/makefile.vc

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 15:31, 1999/10/14
+# This file was automatically generated by tmake at 11:44, 1999/10/14
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -164,7 +164,6 @@ COMMONOBJS = \
 		..\common\$D\imagpcx.obj \
 		..\common\$D\imagpng.obj \
 		..\common\$D\imagpnm.obj \
-		..\common\$D\init.obj \
 		..\common\$D\intl.obj \
 		..\common\$D\ipcbase.obj \
 		..\common\$D\layout.obj \
@@ -286,6 +285,7 @@ MSWOBJS = ..\msw\$D\accel.obj \
 		..\msw\$D\settings.obj \
 		..\msw\$D\slider95.obj \
 		..\msw\$D\spinbutt.obj \
+		..\msw\$D\spinctrl.obj \
 		..\msw\$D\statbmp.obj \
 		..\msw\$D\statbox.obj \
 		..\msw\$D\statbr95.obj \

src/wxvc.dsp

@@ -904,6 +904,10 @@ SOURCE=.\msw\spinbutt.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\spinctrl.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\statbmp.cpp
 # End Source File
 # Begin Source File

src/wxvc6.dsp

@@ -919,6 +919,10 @@ SOURCE=.\msw\spinbutt.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\spinctrl.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\statbmp.cpp
 # End Source File
 # Begin Source File

src/wxvc_dll.dsp

@@ -902,6 +902,10 @@ SOURCE=.\msw\spinbutt.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\spinctrl.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\statbmp.cpp
 # End Source File
 # Begin Source File