From: George Tasker <gtasker@allenbrook.com>
Date: Tue, 13 Mar 2001 21:50:41 +0000 (+0000)
Subject: Additions to support the building of wxBase(d).lib from the command line with VC.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0548ca8d4306e173b8c01202e8ed029a70eb4642?ds=sidebyside

Additions to support the building of wxBase(d).lib from the command line with VC.


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

diff --git a/src/makeprog.vc b/src/makeprog.vc
index 5905a183eb..a9cdd12b2e 100644
--- a/src/makeprog.vc
+++ b/src/makeprog.vc
@@ -33,6 +33,9 @@ wxclean:
         nmake -f makefile.vc clean
 #        cd $(THISDIR)
 
+
+!if "$(wxUSE_GUI)" == "1" 
+
 $(PROGRAM).exe:      $(WXLIB) $(OBJECTS) $(PROGRAM).res
 	$(link) @<<
 -out:$(PROGRAM).exe
@@ -44,6 +47,19 @@ $(LIBS)
 $(PROGRAM).res :      $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
     $(rc) -r /i$(WXDIR)\include /i$(WXDIR)\contrib\include -fo$@ $(PROGRAM).rc
 
+!else
+
+$(PROGRAM).exe:      $(WXLIB) $(OBJECTS)
+	$(link) @<<
+-out:$(PROGRAM).exe
+$(LINKFLAGS)
+$(OBJECTS) $(DUMMYOBJ)
+$(LIBS)
+<<
+
+!endif
+
+
 clean:
         -$(RM) $(OBJECTS)
         -$(RM) *.exe
diff --git a/src/makevc.env b/src/makevc.env
index 71d8e2dca0..c6ecc09d57 100644
--- a/src/makevc.env
+++ b/src/makevc.env
@@ -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,6 +142,12 @@ 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
@@ -149,7 +156,7 @@ 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 "$(WXUSINGDLL)" == "1"
+!if "$(WXUSINGDLL)" == "1" || "$(wxUSE_GUI)" == "0"
 LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS)
 !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
@@ -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