From 4fa193b813e24b593ddf4c146639e0ce0be23747 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Thu, 14 Jul 2005 13:59:49 +0000 Subject: [PATCH] Add Thorsten's VC++ proj and update vss build git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2198 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/win32/baculafd.vcproj | 539 ++++++++++++++++++++++ bacula/src/win32/baculafd/baculavssfd.mak | 51 +- 2 files changed, 577 insertions(+), 13 deletions(-) create mode 100644 bacula/src/win32/baculafd.vcproj diff --git a/bacula/src/win32/baculafd.vcproj b/bacula/src/win32/baculafd.vcproj new file mode 100644 index 0000000000..f36d916161 --- /dev/null +++ b/bacula/src/win32/baculafd.vcproj @@ -0,0 +1,539 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bacula/src/win32/baculafd/baculavssfd.mak b/bacula/src/win32/baculafd/baculavssfd.mak index 20aa87851d..4f78ff56a6 100755 --- a/bacula/src/win32/baculafd/baculavssfd.mak +++ b/bacula/src/win32/baculafd/baculavssfd.mak @@ -111,7 +111,8 @@ CLEAN : -@erase "$(INTDIR)\verify.obj" -@erase "$(INTDIR)\verify_vol.obj" -@erase "$(INTDIR)\vss.obj" - -@erase "$(INTDIR)\vss_generic.obj" + -@erase "$(INTDIR)\vss_xp.obj" + -@erase "$(INTDIR)\vss_w2k3.obj" -@erase "$(INTDIR)\watchdog.obj" -@erase "$(INTDIR)\winabout.obj" -@erase "$(INTDIR)\winapi.obj" @@ -127,14 +128,14 @@ 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 "WIN32_VSS" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "../compat" /I "../.." /I "../../../../depkgs-win32/pthreads" /I "../../../../depkgs-win32/zlib" /I "." /D "_WINDOWS" /D "_WIN32_WINNT=0x500" /D "WIN32_VSS" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c RSC_PROJ=/l 0x409 /fo"$(INTDIR)\winres.res" /d "NDEBUG" BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\baculafd.bsc" BSC32_SBRS= \ LINK32=link.exe -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" +LINK32_FLAGS=ole32.lib oleaut32.lib 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" LINK32_OBJS= \ "$(INTDIR)\address_conf.obj" \ "$(INTDIR)\alist.obj" \ @@ -206,7 +207,8 @@ LINK32_OBJS= \ "$(INTDIR)\verify.obj" \ "$(INTDIR)\verify_vol.obj" \ "$(INTDIR)\vss.obj" \ - "$(INTDIR)\vss_generic.obj" \ + "$(INTDIR)\vss_xp.obj" \ + "$(INTDIR)\vss_w2k3.obj" \ "$(INTDIR)\watchdog.obj" \ "$(INTDIR)\winabout.obj" \ "$(INTDIR)\winapi.obj" \ @@ -377,8 +379,10 @@ CLEAN : -@erase "$(INTDIR)\verify_vol.sbr" -@erase "$(INTDIR)\vss.obj" -@erase "$(INTDIR)\vss.sbr" - -@erase "$(INTDIR)\vss_generic.obj" - -@erase "$(INTDIR)\vss_generic.sbr" + -@erase "$(INTDIR)\vss_xp.obj" + -@erase "$(INTDIR)\vss_xp.sbr" + -@erase "$(INTDIR)\vss_w2k3.obj" + -@erase "$(INTDIR)\vss_w2k3.sbr" -@erase "$(INTDIR)\watchdog.obj" -@erase "$(INTDIR)\watchdog.sbr" -@erase "$(INTDIR)\winabout.obj" @@ -404,7 +408,7 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /I "../compat" /I "../.." /I "../../../../depkgs-win32/pthreads" /I "../../../../depkgs-win32/zlib" /I "." /D "WIN32_VSS" /D "_DEBUG" /D "_WINMAIN_" /D "PTW32_BUILD" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_WIN32" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c +CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /I "../compat" /I "../.." /I "../../../../depkgs-win32/pthreads" /I "../../../../depkgs-win32/zlib" /I "." /D "_WINDOWS" /D "_WIN32_WINNT=0x500" /D "WIN32_VSS" /D "_DEBUG" /D "_WINMAIN_" /D "PTW32_BUILD" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_WIN32" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c RSC_PROJ=/l 0x409 /fo"$(INTDIR)\winres.res" /d "_DEBUG" BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\baculafd.bsc" @@ -479,7 +483,8 @@ BSC32_SBRS= \ "$(INTDIR)\verify.sbr" \ "$(INTDIR)\verify_vol.sbr" \ "$(INTDIR)\vss.sbr" \ - "$(INTDIR)\vss_generic.sbr" \ + "$(INTDIR)\vss_xp.sbr" \ + "$(INTDIR)\vss_w2k3.sbr" \ "$(INTDIR)\watchdog.sbr" \ "$(INTDIR)\winabout.sbr" \ "$(INTDIR)\winapi.sbr" \ @@ -496,7 +501,7 @@ BSC32_SBRS= \ << LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib gdi32.lib shell32.lib wsock32.lib pthreadVCE.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /pdb:none /debug /machine:I386 /nodefaultlib:"MSVCRT.lib" /out:"$(OUTDIR)\bacula-fd.exe" /libpath:"../../../../depkgs-win32/pthreads" /libpath:"../../../../depkgs-win32/zlib" +LINK32_FLAGS=ole32.lib oleaut32.lib user32.lib advapi32.lib gdi32.lib shell32.lib wsock32.lib pthreadVCE.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /pdb:none /debug /machine:I386 /nodefaultlib:"MSVCRT.lib" /out:"$(OUTDIR)\bacula-fd.exe" /libpath:"../../../../depkgs-win32/pthreads" /libpath:"../../../../depkgs-win32/zlib" LINK32_OBJS= \ "$(INTDIR)\address_conf.obj" \ "$(INTDIR)\alist.obj" \ @@ -568,7 +573,8 @@ LINK32_OBJS= \ "$(INTDIR)\verify.obj" \ "$(INTDIR)\verify_vol.obj" \ "$(INTDIR)\vss.obj" \ - "$(INTDIR)\vss_generic.obj" \ + "$(INTDIR)\vss_xp.obj" \ + "$(INTDIR)\vss_w2k3.obj" \ "$(INTDIR)\watchdog.obj" \ "$(INTDIR)\winabout.obj" \ "$(INTDIR)\winapi.obj" \ @@ -1899,24 +1905,43 @@ SOURCE=..\compat\vss.cpp !ENDIF -SOURCE=..\compat\vss_generic.cpp +SOURCE=..\compat\vss_xp.cpp !IF "$(CFG)" == "baculafd - Win32 Release" -"$(INTDIR)\vss_generic.obj" : $(SOURCE) "$(INTDIR)" +"$(INTDIR)\vss_xp.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "baculafd - Win32 Debug" -"$(INTDIR)\vss_generic.obj" "$(INTDIR)\vss_generic.sbr" : $(SOURCE) "$(INTDIR)" +"$(INTDIR)\vss_xp.obj" "$(INTDIR)\vss_xp.sbr" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF +SOURCE=..\compat\vss_w2k3.cpp + +!IF "$(CFG)" == "baculafd - Win32 Release" + + +"$(INTDIR)\vss_w2k3.obj" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ELSEIF "$(CFG)" == "baculafd - Win32 Debug" + + +"$(INTDIR)\vss_w2k3.obj" "$(INTDIR)\vss_w2k3.sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ENDIF + + SOURCE=..\lib\watchdog.cpp -- 2.39.5