From f80b898c2dba6b1f0df1a426ee277e850b20b537 Mon Sep 17 00:00:00 2001 From: Nicolas Boichat Date: Sat, 24 Apr 2004 21:33:18 +0000 Subject: [PATCH] Merged Kern's makefile modifications in the pattern. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1295 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/win32/wx-console/wx-console.mak.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bacula/src/win32/wx-console/wx-console.mak.in b/bacula/src/win32/wx-console/wx-console.mak.in index 234e998cf4..ed9123e47a 100644 --- a/bacula/src/win32/wx-console/wx-console.mak.in +++ b/bacula/src/win32/wx-console/wx-console.mak.in @@ -46,7 +46,7 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "../compat" /I "../.." /I "../../../../depkgs-win32/pthreads" /I "../../../../depkgs-win32/zlib" /I "." /D "NDEBUG" /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /D "_MBCS" /D "HAVE_WIN32" /D "HAVE_WXCONSOLE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "../compat" /I "../.." /I "../../../depkgs-win32/wx/include" /I "../../../../depkgs-win32/wx/include" /I "../../../../depkgs-win32/wx/lib/msw" /I "../../../../depkgs-win32/pthreads" /I "../../../../depkgs-win32/zlib" /I "." /D "NDEBUG" /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /D "_MBCS" /D "HAVE_WIN32" /D "HAVE_WXCONSOLE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c RSC_PROJ=/l 0x409 /fo"$(INTDIR)\winres.res" /d "NDEBUG" BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\wx-console.bsc" @@ -56,7 +56,7 @@ LINK32=link.exe LINK32_FLAGS=wxmsw.lib rpcrt4.lib oleaut32.lib ole32.lib uuid.lib winspool.lib winmm.lib \ comctl32.lib comdlg32.lib Shell32.lib AdvAPI32.lib User32.lib Gdi32.lib wsock32.lib \ wldap32.lib pthreadVCE.lib zlib.lib /nodefaultlib:libcmt.lib \ - /nologo /subsystem:windows /machine:I386 /out:"$(OUTDIR)\wx-console.exe" /libpath:"../../../../depkgs-win32/pthreads" /libpath:"../../../../depkgs-win32/zlib" + /nologo /subsystem:windows /machine:I386 /out:"$(OUTDIR)\wx-console.exe" /libpath:"../../../../depkgs-win32/wx/lib" /libpath:"../../../../depkgs-win32/pthreads" /libpath:"../../../../depkgs-win32/zlib" LINK32_OBJS= \ @@REL-OBJS@@ "$(INTDIR)\wx-console_private.res" -- 2.39.5