From 8f536a9e560292e66cbe1e4adceee0d6cd2d5e95 Mon Sep 17 00:00:00 2001 From: Dan Werthimer Date: Wed, 11 Jun 2003 23:37:37 +0000 Subject: [PATCH] moved files svn path=/trunk/boinc/; revision=1411 --- doc/build.txt | 9 ----- win_build/boinc.dsw | 74 +++++++++++++++++++++++++---------------- win_build/boinc_dll.dsp | 4 +-- 3 files changed, 48 insertions(+), 39 deletions(-) diff --git a/doc/build.txt b/doc/build.txt index 945bb6de4e..14ce2f9c29 100755 --- a/doc/build.txt +++ b/doc/build.txt @@ -138,15 +138,6 @@ Build Windows 1.2.6 Build->Rebuild All 1.2.7 Also rebuild DEBUG version if desired for future development. - 1.2.8 Menu item Build->Set Active Configuration, set to "boinc_ss - Win32 Release" - 1.2.9 Build->Rebuild All - 1.2.10 Also rebuild DEBUG version if desired for future development. - - 1.2.11 Menu item Build->Set Active Configuration, set to "boinc_dll - Win32 Release" - 1.2.12 Build->Rebuild All - 1.2.13 Also rebuild DEBUG version if desired for future development. - - 2 Make installer 2.1 Unzip "boinc_installshield.zip" into a directory diff --git a/win_build/boinc.dsw b/win_build/boinc.dsw index 73de702dde..573ea3915d 100755 --- a/win_build/boinc.dsw +++ b/win_build/boinc.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### -Project: "RSAEuro"=.\RSAEuro\RSAEuro.dsp - Package Owner=<4> +Project: "RSAEuro"=.\RSAEuro.dsp - Package Owner=<4> Package=<5> {{{ @@ -15,7 +15,28 @@ Package=<4> ############################################################################### -Project: "boinc_cli"=.\boinc_cli\boinc_cli.dsp - Package Owner=<4> +Project: "boinc_cli"=.\boinc_cli.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name boinc_dll + End Project Dependency + Begin Project Dependency + Project_Dep_Name RSAEuro + End Project Dependency + Begin Project Dependency + Project_Dep_Name boinc_ss + End Project Dependency +}}} + +############################################################################### + +Project: "boinc_dll"=.\boinc_dll.dsp - Package Owner=<4> Package=<5> {{{ @@ -27,7 +48,28 @@ Package=<4> ############################################################################### -Project: "boinc_dll"=.\boinc_dll\boinc_dll.dsp - Package Owner=<4> +Project: "boinc_gui"=.\boinc_gui.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name boinc_dll + End Project Dependency + Begin Project Dependency + Project_Dep_Name RSAEuro + End Project Dependency + Begin Project Dependency + Project_Dep_Name boinc_ss + End Project Dependency +}}} + +############################################################################### + +Project: "boinc_ss"=.\boinc_ss.dsp - Package Owner=<4> Package=<5> {{{ @@ -39,31 +81,7 @@ Package=<4> ############################################################################### -Project: "boinc_gui"=.\boinc_gui\boinc_gui.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "boinc_ss"=.\boinc_ss\boinc_ss.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "upper_case"=.\upper_case\upper_case.dsp - Package Owner=<4> +Project: "upper_case"=.\upper_case.dsp - Package Owner=<4> Package=<5> {{{ diff --git a/win_build/boinc_dll.dsp b/win_build/boinc_dll.dsp index 6e445dbcc2..82bba5c439 100755 --- a/win_build/boinc_dll.dsp +++ b/win_build/boinc_dll.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 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 /dll /machine:I386 -# ADD LINK32 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 /dll /machine:I386 /out:"Release/boinc.dll" +# ADD LINK32 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 /dll /machine:I386 /out:"boinc_dll_Release/boinc.dll" # Begin Special Build Tool SOURCE="$(InputPath)" PostBuild_Cmds=copy boinc_dll_Release\boinc.dll . @@ -83,7 +83,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 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 /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 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 /dll /debug /machine:I386 /out:"Debug/boinc.dll" /pdbtype:sept +# ADD LINK32 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 /dll /debug /machine:I386 /out:"boinc_dll_Debug/boinc.dll" /pdbtype:sept # Begin Special Build Tool SOURCE="$(InputPath)" PostBuild_Desc=Copy dll to boinc_gui directory