X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0548ca8d4306e173b8c01202e8ed029a70eb4642..68304caffec13015b139c1d567733f14862ae2bd:/src/makevc.env?ds=inline diff --git a/src/makevc.env b/src/makevc.env index c6ecc09d57..1ab59146d1 100644 --- a/src/makevc.env +++ b/src/makevc.env @@ -12,7 +12,7 @@ RM= erase !endif -WXVERSION=23_0 +WXVERSION=233 WIN95=1 !if "$(WIN95)" == "0" @@ -37,8 +37,8 @@ SRCSUFF=cpp 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\ @@ -99,6 +99,14 @@ EXTRADLLFLAGS= EXTRADLLFLAGS=$(EXTRADLLFLAGS) /DNOMAIN !endif +!ifndef UNICODE +UNICODE=0 +!endif + +!ifndef MSLU +MSLU=0 +!endif + !ifndef FINAL FINAL=0 DEBUG=1 @@ -118,15 +126,20 @@ NOPCH=0 # wx$(WXVERSION) (DLL release), wx$(WXVERSION)d (DLL debug) !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1" -WXLIBNAME=wx$(WXVERSION) +WXLIBNAME=wxmsw$(WXVERSION) !else -WXLIBNAME=wx +WXLIBNAME=wxmsw !endif !if "$(NEW_WXLIBNAME)" != "" WXLIBNAME=$(NEW_WXLIBNAME) !endif +!if "$(UNICODE)" == "1" +UNIEXT=u +WXLIBNAME=$(WXLIBNAME)$(UNIEXT) +!endif + !if "$(FINAL)" == "1" D=Release !else if "$(FINAL)" == "hybrid" @@ -145,21 +158,42 @@ WXLIBNAME=$(WXLIBNAME)$(LIBEXT) !if "$(wxUSE_GUI)" == "0" WXLIBNAME=wxBase D=Base$(D) -WXLIBNAME=$(WXLIBNAME)$(LIBEXT) +WXLIBNAME=$(WXLIBNAME)$(UNIEXT)$(LIBEXT) !endif +!if "$(UNICODE)" == "1" +D=$(D)Unicode +!endif + +INCEXT=$(UNIEXT)$(LIBEXT) + !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1" D=$(D)DLL +INCEXT=dll$(INCEXT) +!endif + +#---------------------------------------------------------------------- +# MSLU == Microsoft Layer for Unicode +# See MSDN or the Platform SDK docs for details +!if "$(MSLU)" == "1" +MSLU_FLAGS=/nod:kernel32.lib /nod:advapi32.lib /nod:user32.lib /nod:gdi32.lib /nod:shell32.lib /nod:comdlg32.lib /nod:version.lib /nod:mpr.lib /nod:rasapi32.lib /nod:winmm.lib /nod:winspool.lib /nod:vfw32.lib /nod:secur32.lib /nod:oleacc.lib /nod:oledlg.lib /nod:sensapi.lib +MSLU_LIBS=$(MSLU_FLAGS) unicows.lib !endif WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib -INC=-I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/tiff $(EXTRAINC) +!if "$(wxUSE_GUI)" == "0" +INCTEMP=$(EXTRAINC) -I$(WXDIR)/lib/base$(INCEXT) +!else +INCTEMP=$(EXTRAINC) -I$(WXDIR)/lib/msw$(INCEXT) +!endif + +INC=$(INCTEMP) -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/regex -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/tiff !if "$(WXUSINGDLL)" == "1" || "$(wxUSE_GUI)" == "0" -LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) +LIBS = $(MSLU_LIBS) $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\regex$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib !else -LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib $(WXDIR)\lib\xpm$(LIBEXT).lib +LIBS = $(MSLU_LIBS) $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\regex$(LIBEXT).lib $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib !endif MAKEPRECOMP=/YcWX/WXPREC.H @@ -199,22 +233,22 @@ PCH= PRECOMP= MAKEPRECOMP= !else - + !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 /DSTRICT $(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 /DSTRICT $(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 @@ -225,20 +259,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 @<<