Changes to make commandline compilation with VC6 match the same settings and LIB names as created with the VC IDE.
LIB/PCH/PDB files are now created in the same directories (off the wxWin dir) that the IDE uses git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
176e7e8321
commit
3a7bfa067e
@ -219,18 +219,18 @@ MAKEPRECOMP=
|
||||
!if "$(wxUSE_GUI)" == "0"
|
||||
PCH=wxBase.pch
|
||||
!else
|
||||
PCH=wxvc.pch
|
||||
PCH=wxWindows.pch
|
||||
!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
|
||||
|
||||
|
||||
|
||||
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
|
||||
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
|
||||
@ -241,20 +241,20 @@ DUMMY=dummy
|
||||
!else
|
||||
|
||||
!if "$(WXMAKINGDLL)" == "1"
|
||||
PCH=wxvc.pch
|
||||
PCH=wxWindows.pch
|
||||
DUMMY=dummydll
|
||||
!else
|
||||
PCH=wxvc.pch
|
||||
PCH=wxWindows.pch
|
||||
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
|
||||
|
||||
DUMMYOBJ=$(WXDIR)\src\msw\$D\$(DUMMY).obj
|
||||
DUMMYOBJ=$(WXDIR)\$D\$(DUMMY).obj
|
||||
|
||||
.c.obj:
|
||||
cl @<<
|
||||
|
Loading…
Reference in New Issue
Block a user