From b4d1ebf058c64f5b9e0ddf3264ce8a801eae4f79 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 16 Dec 1999 21:00:59 +0000 Subject: [PATCH] Took out somebody's hard coded path (j:\dev\something...) and put back $(WXWIN). Please just set an environment variable like the rest of us! git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/makelib.vc | 4 ++-- src/makevc.env | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/makelib.vc b/src/makelib.vc index 6cbf046e07..fbb53a1900 100644 --- a/src/makelib.vc +++ b/src/makelib.vc @@ -9,8 +9,8 @@ # Use FINAL=1 argument to nmake to build final version with no debugging # info -# Set WXDIR for your system -WXDIR = j:\dev\wx2\wxWindows +# Set WXDIR for your system (hint, set an environment variable anmed WXWIN) +WXDIR = $(WXWIN) !include $(WXDIR)\src\makevc.env diff --git a/src/makevc.env b/src/makevc.env index 68e7bf0b16..eb7c71ff72 100644 --- a/src/makevc.env +++ b/src/makevc.env @@ -42,8 +42,8 @@ WINLINKFLAGS=/INCREMENTAL:NO /NOLOGO -machine:$(CPU) -subsystem:windows,$(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 -# Change this to your WXWIN directory -WXDIR=j:\dev\wx2\wxWindows +# Set a WXWIN environment variable be the path to your WXWIN directory +WXDIR=$(WXWIN) WXSRC=$(WXDIR)\src\msw WXINC=$(WXDIR)\include