X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=nssm.vcproj;h=5719628e62b82ec438a4dcfeaa7838b089e4cc05;hb=651295f206ecac10db9a24200e67762d24166db5;hp=f9afffde463ba77f9e3359e602b8717dbea69058;hpb=13a14267e612fb6a28ddef57f30f9de2685fc2ff;p=nssm.git

diff --git a/nssm.vcproj b/nssm.vcproj
index f9afffd..5719628 100755
--- a/nssm.vcproj
+++ b/nssm.vcproj
@@ -20,16 +20,18 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
+			OutputDirectory="out\$(ConfigurationName)\win32"
+			IntermediateDirectory="tmp\$(ConfigurationName)\win32"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
+			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Setting version information"
+				CommandLine="version.cmd"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -45,7 +47,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/nssm.tlb"
+				TypeLibraryName="$(IntDir)/$(ProjectName).tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -55,10 +57,10 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug/nssm.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
+				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
+				AssemblerListingLocation="$(IntDir)/"
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -80,7 +82,7 @@
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug/nssm_debug.pdb"
+				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
 				SubSystem="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -98,7 +100,7 @@
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile=".\Debug/nssm.bsc"
+				OutputFile="$(IntDir)/$(ProjectName).bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -112,16 +114,18 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="out\$(ConfigurationName)\win64"
+			IntermediateDirectory="tmp\$(ConfigurationName)\win64"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
+			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Setting version information"
+				CommandLine="version.cmd"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -138,7 +142,7 @@
 			<Tool
 				Name="VCMIDLTool"
 				TargetEnvironment="3"
-				TypeLibraryName=".\Debug/nssm.tlb"
+				TypeLibraryName="$(IntDir)/$(ProjectName).tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -148,10 +152,10 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug/nssm.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
+				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
+				AssemblerListingLocation="$(IntDir)/"
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -161,7 +165,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="_DEBUG;_WIN64"
 				Culture="2057"
 			/>
 			<Tool
@@ -173,7 +177,7 @@
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug/nssm_debug.pdb"
+				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
 				SubSystem="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -191,7 +195,7 @@
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile=".\Debug/nssm.bsc"
+				OutputFile="$(IntDir)/$(ProjectName).bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -205,16 +209,18 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
+			OutputDirectory="out\$(ConfigurationName)\win32"
+			IntermediateDirectory="tmp\$(ConfigurationName)\win32"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
+			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Setting version information"
+				CommandLine="version.cmd"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -230,7 +236,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/nssm.tlb"
+				TypeLibraryName="$(IntDir)/$(ProjectName).tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -241,10 +247,10 @@
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release/nssm.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
+				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
+				AssemblerListingLocation="$(IntDir)/"
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 			/>
@@ -264,7 +270,7 @@
 				AdditionalDependencies="shlwapi.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\Release/nssm.pdb"
+				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
 				SubSystem="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -282,7 +288,7 @@
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile=".\Release/nssm.bsc"
+				OutputFile="$(IntDir)/$(ProjectName).bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -296,16 +302,18 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="out\$(ConfigurationName)\win64"
+			IntermediateDirectory="tmp\$(ConfigurationName)\win64"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
+			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Setting version information"
+				CommandLine="version.cmd"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -322,7 +330,7 @@
 			<Tool
 				Name="VCMIDLTool"
 				TargetEnvironment="3"
-				TypeLibraryName=".\Release/nssm.tlb"
+				TypeLibraryName="$(IntDir)/$(ProjectName).tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -333,10 +341,10 @@
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release/nssm.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
+				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
+				AssemblerListingLocation="$(IntDir)/"
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 			/>
@@ -345,7 +353,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="NDEBUG;_WIN64"
 				Culture="2057"
 			/>
 			<Tool
@@ -356,7 +364,7 @@
 				AdditionalDependencies="shlwapi.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\Release/nssm.pdb"
+				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
 				SubSystem="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -374,7 +382,7 @@
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile=".\Release/nssm.bsc"
+				OutputFile="$(IntDir)/$(ProjectName).bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -394,6 +402,18 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
+			<File
+				RelativePath="account.cpp"
+				>
+			</File>
+			<File
+				RelativePath="console.cpp"
+				>
+			</File>
+			<File
+				RelativePath="env.cpp"
+				>
+			</File>
 			<File
 				RelativePath="event.cpp"
 				>
@@ -466,6 +486,18 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="hook.cpp"
+				>
+			</File>
+			<File
+				RelativePath="imports.cpp"
+				>
+			</File>
+			<File
+				RelativePath="io.cpp"
+				>
+			</File>
 			<File
 				RelativePath="nssm.cpp"
 				>
@@ -610,11 +642,27 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="settings.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl"
 			>
+			<File
+				RelativePath="account.h"
+				>
+			</File>
+			<File
+				RelativePath="console.h"
+				>
+			</File>
+			<File
+				RelativePath="env.h"
+				>
+			</File>
 			<File
 				RelativePath="event.h"
 				>
@@ -623,6 +671,18 @@
 				RelativePath="gui.h"
 				>
 			</File>
+			<File
+				RelativePath="hook.h"
+				>
+			</File>
+			<File
+				RelativePath="imports.h"
+				>
+			</File>
+			<File
+				RelativePath="io.h"
+				>
+			</File>
 			<File
 				RelativePath="nssm.h"
 				>
@@ -639,6 +699,10 @@
 				RelativePath="service.h"
 				>
 			</File>
+			<File
+				RelativePath="settings.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -686,7 +750,7 @@
 			</File>
 		</Filter>
 		<File
-			RelativePath=".\messages.mc"
+			RelativePath="messages.mc"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -694,7 +758,7 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Compiling messages"
-					CommandLine="mc -A $(InputName).mc -r . -h ."
+					CommandLine="mc -u -U $(InputName).mc -r . -h ."
 					Outputs="$(InputName).rc;$(InputName).h"
 				/>
 			</FileConfiguration>
@@ -704,7 +768,7 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Compiling messages"
-					CommandLine="mc -A $(InputName).mc -r . -h ."
+					CommandLine="mc -u -U $(InputName).mc -r . -h ."
 					Outputs="$(InputName).rc;$(InputName).h"
 				/>
 			</FileConfiguration>
@@ -714,7 +778,7 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Compiling messages"
-					CommandLine="mc -A $(InputName).mc -r . -h ."
+					CommandLine="mc -u -U $(InputName).mc -r . -h ."
 					AdditionalDependencies=""
 					Outputs="$(InputName).rc;$(InputName).h"
 				/>
@@ -725,7 +789,7 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Compiling messages"
-					CommandLine="mc -A $(InputName).mc -r . -h ."
+					CommandLine="mc -u -U $(InputName).mc -r . -h ."
 					AdditionalDependencies=""
 					Outputs="$(InputName).rc;$(InputName).h"
 				/>