Had to add some system dll's to get bacula-fd to link on my system. Not sure

if this is specific to my system, but shouldn't be an issue on others.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1378 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/win32/baculafd/baculafd.mak b/bacula/src/win32/baculafd/baculafd.mak
index 0eca0eb0a9726331a4cc1e0028917a118c6b823a..508828ce0a974f428259884e447873f7b4ed8737 100644 (file)
--- a/bacula/src/win32/baculafd/baculafd.mak
+++ b/bacula/src/win32/baculafd/baculafd.mak
@@ -25,9 +25,6 @@ NULL=
 NULL=nul\r
 !ENDIF \r
 \r
-CPP=cl.exe\r
-RSC=rc.exe\r
-\r
 !IF  "$(CFG)" == "baculafd - Win32 Release"\r
 \r
 OUTDIR=.\Release\r
@@ -117,15 +114,47 @@ CLEAN :
 "$(OUTDIR)" :\r
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
 \r
+CPP=cl.exe\r
 CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "../compat" /I "../.." /I "../../../../depkgs-win32/pthreads" /I "../../../../depkgs-win32/zlib" /I "." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
+\r
+.c{$(INTDIR)}.obj::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.cpp{$(INTDIR)}.obj::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.cxx{$(INTDIR)}.obj::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.c{$(INTDIR)}.sbr::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.cpp{$(INTDIR)}.sbr::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.cxx{$(INTDIR)}.sbr::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+RSC=rc.exe\r
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\winres.res" /d "NDEBUG" \r
 BSC32=bscmake.exe\r
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\baculafd.bsc" \r
 BSC32_SBRS= \\r
        \r
 LINK32=link.exe\r
-# Added the first 4 lib files, to allow compatibility with the free version of VC++.\r
-LINK32_FLAGS=Shell32.lib AdvAPI32.lib User32.lib Gdi32.lib wsock32.lib pthreadVCE.lib zlib.lib /nologo /subsystem:windows /pdb:none /machine:I386 /nodefaultlib:"MSVCRT.lib" /out:"$(OUTDIR)\bacula-fd.exe" /libpath:"../../../../depkgs-win32/pthreads" /libpath:"../../../../depkgs-win32/zlib" \r
+LINK32_FLAGS=user32.lib ADVAPI32.LIB gdi32.lib wsock32.lib shell32.lib pthreadVCE.lib zlib.lib /nologo /subsystem:windows /pdb:none /machine:I386 /nodefaultlib:"MSVCRT.lib" /out:"$(OUTDIR)\bacula-fd.exe" /libpath:"../../../../depkgs-win32/pthreads" /libpath:"../../../../depkgs-win32/zlib" \r
 LINK32_OBJS= \\r
        "$(INTDIR)\alist.obj" \\r
        "$(INTDIR)\alloc.obj" \\r
@@ -365,7 +394,40 @@ CLEAN :
 "$(OUTDIR)" :\r
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
 \r
+CPP=cl.exe\r
 CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "../compat" /I "../.." /I "../../../../depkgs-win32/pthreads" /I "../../../../depkgs-win32/zlib" /I "." /D "_DEBUG" /D "_WINMAIN_" /D "PTW32_BUILD" /D "_AFXDLL" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_WIN32" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
+\r
+.c{$(INTDIR)}.obj::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.cpp{$(INTDIR)}.obj::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.cxx{$(INTDIR)}.obj::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.c{$(INTDIR)}.sbr::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.cpp{$(INTDIR)}.sbr::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.cxx{$(INTDIR)}.sbr::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+RSC=rc.exe\r
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\winres.res" /d "_DEBUG" /d "_AFXDLL" \r
 BSC32=bscmake.exe\r
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\baculafd.bsc" \r
@@ -447,7 +509,7 @@ BSC32_SBRS= \
 <<\r
 \r
 LINK32=link.exe\r
-LINK32_FLAGS=wsock32.lib pthreadVCE.lib zlib.lib /nologo /subsystem:windows /pdb:none /debug /machine:I386 /out:"$(OUTDIR)\bacula-fd.exe" /libpath:"../../../../depkgs-win32/pthreads" /libpath:"../../../../depkgs-win32/zlib" \r
+LINK32_FLAGS=user32.lib ADVAPI32.LIB gdi32.lib shell32.lib wsock32.lib pthreadVCE.lib zlib.lib /nologo /subsystem:windows /pdb:none /debug /machine:I386 /out:"$(OUTDIR)\bacula-fd.exe" /libpath:"../../../../depkgs-win32/pthreads" /libpath:"../../../../depkgs-win32/zlib" \r
 LINK32_OBJS= \\r
        "$(INTDIR)\alist.obj" \\r
        "$(INTDIR)\alloc.obj" \\r
@@ -528,36 +590,6 @@ LINK32_OBJS= \
 \r
 !ENDIF \r
 \r
-.c{$(INTDIR)}.obj::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cpp{$(INTDIR)}.obj::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cxx{$(INTDIR)}.obj::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.c{$(INTDIR)}.sbr::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cpp{$(INTDIR)}.sbr::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cxx{$(INTDIR)}.sbr::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
 \r
 !IF "$(NO_EXTERNAL_DEPS)" != "1"\r
 !IF EXISTS("baculafd.dep")\r
@@ -1761,14 +1793,14 @@ SOURCE=..\..\filed\win32\winres.rc
 \r
 \r
 "$(INTDIR)\winres.res" : $(SOURCE) "$(INTDIR)"\r
-       $(RSC) /l 0x409 /fo"$(INTDIR)\winres.res" /i "\cygwin\home\kern\bacula\k\src\filed\win32" /d "NDEBUG" $(SOURCE)\r
+       $(RSC) /l 0x409 /fo"$(INTDIR)\winres.res" /i "..\..\filed\win32" /d "NDEBUG" $(SOURCE)\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "baculafd - Win32 Debug"\r
 \r
 \r
 "$(INTDIR)\winres.res" : $(SOURCE) "$(INTDIR)"\r
-       $(RSC) /l 0x409 /fo"$(INTDIR)\winres.res" /i "\cygwin\home\kern\bacula\k\src\filed\win32" /d "_DEBUG" /d "_AFXDLL" $(SOURCE)\r
+       $(RSC) /l 0x409 /fo"$(INTDIR)\winres.res" /i "..\..\filed\win32" /d "_DEBUG" /d "_AFXDLL" $(SOURCE)\r
 \r
 \r
 !ENDIF \r