no real changes

[wxWidgets.git] / src / makevc.env

diff --git a/src/makevc.env b/src/makevc.env
index fc045d5942e0df0502ed987214962d1669f3d47c..fe3b248de29bd3e20afff4bada827ceff28439b1 100644 (file)
--- a/src/makevc.env
+++ b/src/makevc.env
@@ -37,8 +37,8 @@ SRCSUFF=cpp
 WAITFLAG=/w
 
 # If you set wxUSE_IOSTREAMH to 0, remove -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally
 WAITFLAG=/w
 
 # If you set wxUSE_IOSTREAMH to 0, remove -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally

-#WINFLAGS=-c -W3 -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 -DWIN32 -D__WIN32__ $(WINVERSION)
-WINFLAGS=-c -W3 -nologo -DWIN32 -D__WIN32__ -D_WINDOWS $(WINVERSION)
+#WINFLAGS=-c -W3 -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 -DWIN32 -D__WIN32__ $(WINVERSION) -DSTRICT
+WINFLAGS=-c -W3 -nologo -DWIN32 -D__WIN32__ -D_WINDOWS $(WINVERSION) -DSTRICT

 WINLINKFLAGS=/INCREMENTAL:NO /NOLOGO -machine:$(CPU) -subsystem:windows,$(APPVER)
 BASELINKFLAGS=/INCREMENTAL:NO /NOLOGO -machine:$(CPU) -subsystem:console,$(APPVER)
 WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib oldnames.lib\
 WINLINKFLAGS=/INCREMENTAL:NO /NOLOGO -machine:$(CPU) -subsystem:windows,$(APPVER)
 BASELINKFLAGS=/INCREMENTAL:NO /NOLOGO -machine:$(CPU) -subsystem:console,$(APPVER)
 WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib oldnames.lib\


@@ -219,18 +219,18 @@ MAKEPRECOMP=
 !if "$(wxUSE_GUI)" == "0"
 PCH=wxBase.pch
 !else
 !if "$(wxUSE_GUI)" == "0"
 PCH=wxBase.pch
 !else

-PCH=wxvc.pch
+PCH=wxWindows.pch

 !endif
 
 !endif
 

-PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$D\$(PCH) /Fd$(WXDIR)\src\msw\$D\vc60.pdb
+PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\$D\$(PCH) /Fd$(WXDIR)\$D\vc60.pdb

 MAKEPRECOMP=/YcWX/WXPREC.H
 !endif
 
 
 
 MAKEPRECOMP=/YcWX/WXPREC.H
 !endif
 
 
 

-CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) $(EXTRADLLFLAGS)  $(CRTFLAG) /D__WINDOWS__ /GX $(OVERRIDEFLAGS)
+CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) $(EXTRADLLFLAGS)  $(CRTFLAG) /D__WINDOWS__ /GX- $(OVERRIDEFLAGS)

 # If you don't include wxprec.h, use CPPFLAGS2
 # If you don't include wxprec.h, use CPPFLAGS2

-CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) /D__WINDOWS__ /GX $(OVERRIDEFLAGS)
+CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) /D__WINDOWS__ /GX- $(OVERRIDEFLAGS)

 !if "$(wxUSE_GUI)" == "0"
 LINKFLAGS=$(LINK_DEBUG_FLAGS) $(BASELINKFLAGS)
 !else
 !if "$(wxUSE_GUI)" == "0"
 LINKFLAGS=$(LINK_DEBUG_FLAGS) $(BASELINKFLAGS)
 !else


@@ -241,20 +241,20 @@ DUMMY=dummy
 !else
 
 !if "$(WXMAKINGDLL)" == "1"
 !else
 
 !if "$(WXMAKINGDLL)" == "1"

-PCH=wxvc.pch
+PCH=wxWindows.pch

 DUMMY=dummydll
 !else
 DUMMY=dummydll
 !else

-PCH=wxvc.pch
+PCH=wxWindows.pch

 DUMMY=dummy
 !endif
 
 DUMMY=dummy
 !endif
 

-PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$D\$(PCH) /Fd$(WXDIR)\lib\$(WXLIBNAME).pdb
+PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\$D\$(PCH) /Fd$(WXDIR)\lib\$(WXLIBNAME).pdb

 CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDOWS /D__WINDOWS__ /D_WINDLL
 CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ $(INC) $(EXTRAFLAGS) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDOWS /D__WINDOWS__ /D_WINDLL
 LINKFLAGS=$(LINK_DEBUG_FLAGS) -machine:i386 -subsystem:windows,$(APPVER) -dll # -entry:_DllMainCRTStartup$(DLLENTRY)
 !endif
 
 CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDOWS /D__WINDOWS__ /D_WINDLL
 CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ $(INC) $(EXTRAFLAGS) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDOWS /D__WINDOWS__ /D_WINDLL
 LINKFLAGS=$(LINK_DEBUG_FLAGS) -machine:i386 -subsystem:windows,$(APPVER) -dll # -entry:_DllMainCRTStartup$(DLLENTRY)
 !endif
 

-DUMMYOBJ=$(WXDIR)\src\msw\$D\$(DUMMY).obj
+DUMMYOBJ=$(WXDIR)\$D\$(DUMMY).obj

 
 .c.obj:
        cl @<<
 
 .c.obj:
        cl @<<