X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0580ae4b9be3a39fbefd88429dbc3920f5590529..2fe212b0336512aac9eace69fab09ce856b0bf4b:/src/makevc.env diff --git a/src/makevc.env b/src/makevc.env index 71d8e2dca0..5baee82b97 100644 --- a/src/makevc.env +++ b/src/makevc.env @@ -12,7 +12,7 @@ RM= erase !endif -WXVERSION=23_0 +WXVERSION=23_2 WIN95=1 !if "$(WIN95)" == "0" @@ -40,6 +40,7 @@ WAITFLAG=/w #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) 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\ comctl32.lib ctl3d32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib # libci.lib # libci.lib required for VC++ 4.2 @@ -141,18 +142,24 @@ LIBEXT=d WXLIBNAME=$(WXLIBNAME)$(LIBEXT) !endif +!if "$(wxUSE_GUI)" == "0" +WXLIBNAME=wxBase +D=Base$(D) +WXLIBNAME=$(WXLIBNAME)$(LIBEXT) +!endif + !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1" D=$(D)DLL !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) +INC=$(EXTRAINC) -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" -LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) +!if "$(WXUSINGDLL)" == "1" || "$(wxUSE_GUI)" == "0" +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 = $(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 @@ -192,15 +199,27 @@ PCH= PRECOMP= MAKEPRECOMP= !else + +!if "$(wxUSE_GUI)" == "0" +PCH=wxBase.pch +!else PCH=wxvc.pch +!endif + PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$D\$(PCH) /Fd$(WXDIR)\src\msw\$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) # 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) +!if "$(wxUSE_GUI)" == "0" +LINKFLAGS=$(LINK_DEBUG_FLAGS) $(BASELINKFLAGS) +!else LINKFLAGS=$(LINK_DEBUG_FLAGS) $(WINLINKFLAGS) -entry:WinMainCRTStartup +!endif DUMMY=dummy !else