From e991010aa9a92c01c7d0559097644c3344438270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Wed, 28 Aug 2013 23:20:04 +0200 Subject: [PATCH] Change compile-options: Old behavior is Release/Debug; New behavior (save data to user-folde) is installer now. --- GstreamerHelper/GstreamerHelper.vcxproj | 38 +++++++------- .../PartyModeChallenge.csproj | 10 ++-- .../PartyModeChallengeMedley.csproj | 10 ++-- .../PartyModeTicTacToe.csproj | 10 ++-- Vocaluxe.sln | 52 +++++++++---------- Vocaluxe/Base/CConfig.cs | 7 ++- Vocaluxe/Base/CSettings.cs | 12 ++--- Vocaluxe/Vocaluxe.csproj | 12 ++--- VocaluxeLib/VocaluxeLib.csproj | 10 ++-- 9 files changed, 79 insertions(+), 82 deletions(-) diff --git a/GstreamerHelper/GstreamerHelper.vcxproj b/GstreamerHelper/GstreamerHelper.vcxproj index fd3c7260..81d50d0e 100644 --- a/GstreamerHelper/GstreamerHelper.vcxproj +++ b/GstreamerHelper/GstreamerHelper.vcxproj @@ -9,12 +9,12 @@ DebugWin x64 - - PortableWin + + InstallerWin Win32 - - PortableWin + + InstallerWin x64 @@ -51,7 +51,7 @@ true Unicode - + DynamicLibrary false v110_xp @@ -65,7 +65,7 @@ true Unicode - + DynamicLibrary false v110_xp @@ -84,13 +84,13 @@ - + - + @@ -118,7 +118,7 @@ $(MSBuildProjectDirectory)\x86\lib;$(LibraryPath) obj\$(Configuration).$(Platform)\ - + false bin\$(Configuration).$(Platform)\ $(MSBuildProjectDirectory)\x86\lib\glib-2.0\include;$(MSBuildProjectDirectory)\x86\include\gstreamer-1.0;$(MSBuildProjectDirectory)\x86\include\glib-2.0;$(MSBuildProjectDirectory)\x86\include;$(IncludePath) @@ -132,7 +132,7 @@ $(MSBuildProjectDirectory)\x64\lib;$(LibraryPath) obj\$(Configuration).$(Platform)\ - + false bin\$(Configuration).$(Platform)\ $(MSBuildProjectDirectory)\x64\lib\glib-2.0\include;$(MSBuildProjectDirectory)\x64\include\gstreamer-1.0;$(MSBuildProjectDirectory)\x64\include\glib-2.0;$(MSBuildProjectDirectory)\x64\include;$(IncludePath) @@ -210,7 +210,7 @@ Copying binary - + Level3 Use @@ -258,7 +258,7 @@ xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\x64\gstreamer\" /I /Y - + Level3 Use @@ -299,16 +299,16 @@ false - false + false false - false + false - + - + @@ -319,13 +319,13 @@ Create Create Create - Create + Create Create - Create + Create - \ No newline at end of file + diff --git a/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj b/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj index 52d14088..e9ca8fc6 100644 --- a/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj +++ b/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj @@ -106,8 +106,8 @@ - - bin\x86\PortableWin\ + + bin WIN true AnyCPU @@ -116,8 +116,8 @@ prompt ManagedMinimumRules.ruleset - - bin\x64\PortableWin\ + + bin WIN true AnyCPU @@ -161,4 +161,4 @@ xcopy "$(ProjectDir)*.cs" "$(SolutionDir)Output\PartyModes\$(TargetName)\Code\" --> - \ No newline at end of file + diff --git a/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj b/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj index 15bea0ed..4f6ab862 100644 --- a/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj +++ b/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj @@ -106,8 +106,8 @@ - - bin\x86\PortableWin\ + + bin WIN true AnyCPU @@ -116,8 +116,8 @@ prompt ManagedMinimumRules.ruleset - - bin\x64\PortableWin\ + + bin WIN true AnyCPU @@ -161,4 +161,4 @@ xcopy "$(ProjectDir)*.cs" "$(SolutionDir)Output\PartyModes\$(TargetName)\Code\" --> - \ No newline at end of file + diff --git a/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj b/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj index a03eafb6..fb739e23 100644 --- a/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj +++ b/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj @@ -106,8 +106,8 @@ - - bin\x86\PortableWin\ + + bin WIN true AnyCPU @@ -116,8 +116,8 @@ prompt ManagedMinimumRules.ruleset - - bin\x64\PortableWin\ + + bin WIN true AnyCPU @@ -160,4 +160,4 @@ xcopy "$(ProjectDir)*.cs" "$(SolutionDir)Output\PartyModes\$(TargetName)\Code\" --> - \ No newline at end of file + diff --git a/Vocaluxe.sln b/Vocaluxe.sln index 44172895..d894246e 100644 --- a/Vocaluxe.sln +++ b/Vocaluxe.sln @@ -26,8 +26,8 @@ Global DebugLinux|x86 = DebugLinux|x86 DebugWin|x64 = DebugWin|x64 DebugWin|x86 = DebugWin|x86 - PortableWin|x64 = PortableWin|x64 - PortableWin|x86 = PortableWin|x86 + InstallerWin|x64 = InstallerWin|x64 + InstallerWin|x86 = InstallerWin|x86 ReleaseLinux|x64 = ReleaseLinux|x64 ReleaseLinux|x86 = ReleaseLinux|x86 ReleaseWin|x64 = ReleaseWin|x64 @@ -42,10 +42,10 @@ Global {2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.DebugWin|x64.Build.0 = DebugWin|x64 {2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.DebugWin|x86.ActiveCfg = DebugWin|x86 {2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.DebugWin|x86.Build.0 = DebugWin|x86 - {2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.PortableWin|x64.ActiveCfg = PortableWin|x64 - {2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.PortableWin|x64.Build.0 = PortableWin|x64 - {2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.PortableWin|x86.ActiveCfg = PortableWin|x86 - {2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.PortableWin|x86.Build.0 = PortableWin|x86 + {2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.InstallerWin|x64.ActiveCfg = InstallerWin|x64 + {2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.InstallerWin|x64.Build.0 = InstallerWin|x64 + {2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.InstallerWin|x86.ActiveCfg = InstallerWin|x86 + {2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.InstallerWin|x86.Build.0 = InstallerWin|x86 {2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.ReleaseLinux|x64.ActiveCfg = ReleaseLinux|x64 {2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.ReleaseLinux|x64.Build.0 = ReleaseLinux|x64 {2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.ReleaseLinux|x86.ActiveCfg = ReleaseLinux|x86 @@ -62,10 +62,10 @@ Global {D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugWin|x64.Build.0 = DebugWin|x64 {D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugWin|x86.ActiveCfg = DebugWin|x86 {D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugWin|x86.Build.0 = DebugWin|x86 - {D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.PortableWin|x64.ActiveCfg = PortableWin|x64 - {D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.PortableWin|x64.Build.0 = PortableWin|x64 - {D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.PortableWin|x86.ActiveCfg = PortableWin|x86 - {D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.PortableWin|x86.Build.0 = PortableWin|x86 + {D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.InstallerWin|x64.ActiveCfg = InstallerWin|x64 + {D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.InstallerWin|x64.Build.0 = InstallerWin|x64 + {D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.InstallerWin|x86.ActiveCfg = InstallerWin|x86 + {D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.InstallerWin|x86.Build.0 = InstallerWin|x86 {D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseLinux|x64.ActiveCfg = ReleaseLinux|x64 {D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseLinux|x64.Build.0 = ReleaseLinux|x64 {D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseLinux|x86.ActiveCfg = ReleaseLinux|x86 @@ -82,10 +82,10 @@ Global {6F3E1874-F28A-40E9-AFBD-31934D593679}.DebugWin|x64.Build.0 = DebugWin|x64 {6F3E1874-F28A-40E9-AFBD-31934D593679}.DebugWin|x86.ActiveCfg = DebugWin|x86 {6F3E1874-F28A-40E9-AFBD-31934D593679}.DebugWin|x86.Build.0 = DebugWin|x86 - {6F3E1874-F28A-40E9-AFBD-31934D593679}.PortableWin|x64.ActiveCfg = PortableWin|x64 - {6F3E1874-F28A-40E9-AFBD-31934D593679}.PortableWin|x64.Build.0 = PortableWin|x64 - {6F3E1874-F28A-40E9-AFBD-31934D593679}.PortableWin|x86.ActiveCfg = PortableWin|x86 - {6F3E1874-F28A-40E9-AFBD-31934D593679}.PortableWin|x86.Build.0 = PortableWin|x86 + {6F3E1874-F28A-40E9-AFBD-31934D593679}.InstallerWin|x64.ActiveCfg = InstallerWin|x64 + {6F3E1874-F28A-40E9-AFBD-31934D593679}.InstallerWin|x64.Build.0 = InstallerWin|x64 + {6F3E1874-F28A-40E9-AFBD-31934D593679}.InstallerWin|x86.ActiveCfg = InstallerWin|x86 + {6F3E1874-F28A-40E9-AFBD-31934D593679}.InstallerWin|x86.Build.0 = InstallerWin|x86 {6F3E1874-F28A-40E9-AFBD-31934D593679}.ReleaseLinux|x64.ActiveCfg = ReleaseLinux|x64 {6F3E1874-F28A-40E9-AFBD-31934D593679}.ReleaseLinux|x64.Build.0 = ReleaseLinux|x64 {6F3E1874-F28A-40E9-AFBD-31934D593679}.ReleaseLinux|x86.ActiveCfg = ReleaseLinux|x86 @@ -102,10 +102,10 @@ Global {5A4053F1-5AD5-441F-B254-D97A088127B6}.DebugWin|x64.Build.0 = DebugWin|x64 {5A4053F1-5AD5-441F-B254-D97A088127B6}.DebugWin|x86.ActiveCfg = DebugWin|x86 {5A4053F1-5AD5-441F-B254-D97A088127B6}.DebugWin|x86.Build.0 = DebugWin|x86 - {5A4053F1-5AD5-441F-B254-D97A088127B6}.PortableWin|x64.ActiveCfg = PortableWin|x64 - {5A4053F1-5AD5-441F-B254-D97A088127B6}.PortableWin|x64.Build.0 = PortableWin|x64 - {5A4053F1-5AD5-441F-B254-D97A088127B6}.PortableWin|x86.ActiveCfg = PortableWin|x86 - {5A4053F1-5AD5-441F-B254-D97A088127B6}.PortableWin|x86.Build.0 = PortableWin|x86 + {5A4053F1-5AD5-441F-B254-D97A088127B6}.InstallerWin|x64.ActiveCfg = InstallerWin|x64 + {5A4053F1-5AD5-441F-B254-D97A088127B6}.InstallerWin|x64.Build.0 = InstallerWin|x64 + {5A4053F1-5AD5-441F-B254-D97A088127B6}.InstallerWin|x86.ActiveCfg = InstallerWin|x86 + {5A4053F1-5AD5-441F-B254-D97A088127B6}.InstallerWin|x86.Build.0 = InstallerWin|x86 {5A4053F1-5AD5-441F-B254-D97A088127B6}.ReleaseLinux|x64.ActiveCfg = ReleaseLinux|x64 {5A4053F1-5AD5-441F-B254-D97A088127B6}.ReleaseLinux|x64.Build.0 = ReleaseLinux|x64 {5A4053F1-5AD5-441F-B254-D97A088127B6}.ReleaseLinux|x86.ActiveCfg = ReleaseLinux|x86 @@ -122,10 +122,10 @@ Global {6F3E1874-F28A-40E9-AFBD-31934D593678}.DebugWin|x64.Build.0 = DebugWin|x64 {6F3E1874-F28A-40E9-AFBD-31934D593678}.DebugWin|x86.ActiveCfg = DebugWin|x86 {6F3E1874-F28A-40E9-AFBD-31934D593678}.DebugWin|x86.Build.0 = DebugWin|x86 - {6F3E1874-F28A-40E9-AFBD-31934D593678}.PortableWin|x64.ActiveCfg = PortableWin|x64 - {6F3E1874-F28A-40E9-AFBD-31934D593678}.PortableWin|x64.Build.0 = PortableWin|x64 - {6F3E1874-F28A-40E9-AFBD-31934D593678}.PortableWin|x86.ActiveCfg = PortableWin|x86 - {6F3E1874-F28A-40E9-AFBD-31934D593678}.PortableWin|x86.Build.0 = PortableWin|x86 + {6F3E1874-F28A-40E9-AFBD-31934D593678}.InstallerWin|x64.ActiveCfg = InstallerWin|x64 + {6F3E1874-F28A-40E9-AFBD-31934D593678}.InstallerWin|x64.Build.0 = InstallerWin|x64 + {6F3E1874-F28A-40E9-AFBD-31934D593678}.InstallerWin|x86.ActiveCfg = InstallerWin|x86 + {6F3E1874-F28A-40E9-AFBD-31934D593678}.InstallerWin|x86.Build.0 = InstallerWin|x86 {6F3E1874-F28A-40E9-AFBD-31934D593678}.ReleaseLinux|x64.ActiveCfg = ReleaseLinux|x64 {6F3E1874-F28A-40E9-AFBD-31934D593678}.ReleaseLinux|x64.Build.0 = ReleaseLinux|x64 {6F3E1874-F28A-40E9-AFBD-31934D593678}.ReleaseLinux|x86.ActiveCfg = ReleaseLinux|x86 @@ -140,10 +140,10 @@ Global {ED007796-367F-4142-AA55-5450C7645C2C}.DebugWin|x64.Build.0 = DebugWin|x64 {ED007796-367F-4142-AA55-5450C7645C2C}.DebugWin|x86.ActiveCfg = DebugWin|Win32 {ED007796-367F-4142-AA55-5450C7645C2C}.DebugWin|x86.Build.0 = DebugWin|Win32 - {ED007796-367F-4142-AA55-5450C7645C2C}.PortableWin|x64.ActiveCfg = PortableWin|x64 - {ED007796-367F-4142-AA55-5450C7645C2C}.PortableWin|x64.Build.0 = PortableWin|x64 - {ED007796-367F-4142-AA55-5450C7645C2C}.PortableWin|x86.ActiveCfg = PortableWin|Win32 - {ED007796-367F-4142-AA55-5450C7645C2C}.PortableWin|x86.Build.0 = PortableWin|Win32 + {ED007796-367F-4142-AA55-5450C7645C2C}.InstallerWin|x64.ActiveCfg = InstallerWin|x64 + {ED007796-367F-4142-AA55-5450C7645C2C}.InstallerWin|x64.Build.0 = InstallerWin|x64 + {ED007796-367F-4142-AA55-5450C7645C2C}.InstallerWin|x86.ActiveCfg = InstallerWin|Win32 + {ED007796-367F-4142-AA55-5450C7645C2C}.InstallerWin|x86.Build.0 = InstallerWin|Win32 {ED007796-367F-4142-AA55-5450C7645C2C}.ReleaseLinux|x64.ActiveCfg = ReleaseWin|x64 {ED007796-367F-4142-AA55-5450C7645C2C}.ReleaseLinux|x86.ActiveCfg = ReleaseWin|x64 {ED007796-367F-4142-AA55-5450C7645C2C}.ReleaseWin|x64.ActiveCfg = ReleaseWin|x64 diff --git a/Vocaluxe/Base/CConfig.cs b/Vocaluxe/Base/CConfig.cs index 05dc6c37..7a68bc66 100644 --- a/Vocaluxe/Base/CConfig.cs +++ b/Vocaluxe/Base/CConfig.cs @@ -146,11 +146,10 @@ namespace Vocaluxe.Base _Settings.Encoding = Encoding.UTF8; _Settings.ConformanceLevel = ConformanceLevel.Document; -#if PORTABLE - SongFolder.Add(Path.Combine(Directory.GetCurrentDirectory(), CSettings.FolderSongs)); -#else - SongFolder.Add(Path.Combine(CSettings.DataPath, CSettings.FolderSongs)); SongFolder.Add(Path.Combine(Directory.GetCurrentDirectory(), CSettings.FolderSongs)); + +#if INSTALLER + SongFolder.Add(Path.Combine(CSettings.DataPath, CSettings.FolderSongs)); #endif foreach (string folder in SongFolder) diff --git a/Vocaluxe/Base/CSettings.cs b/Vocaluxe/Base/CSettings.cs index e349b2f5..cfcecb23 100644 --- a/Vocaluxe/Base/CSettings.cs +++ b/Vocaluxe/Base/CSettings.cs @@ -68,10 +68,10 @@ namespace Vocaluxe.Base public static bool IsFullScreen; public const int VertexBufferElements = 10000; -#if PORTABLE - public static string DataPath = Environment.CurrentDirectory; +#if INSTALLER + public static string DataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "Vocaluxe"); #else - public static string DataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),"Vocaluxe"); + public static string DataPath = Environment.CurrentDirectory; #endif public const string Icon = "Vocaluxe.ico"; @@ -99,12 +99,10 @@ namespace Vocaluxe.Base public const string FolderProfiles = "Profiles"; public static List FoldersProfiles = new List() { -#if PORTABLE - Path.Combine(DataPath, FolderProfiles) -#else +#if INSTALLER Path.Combine(Environment.CurrentDirectory, FolderProfiles), - Path.Combine(DataPath, FolderProfiles) #endif + Path.Combine(DataPath, FolderProfiles) }; public const string FolderSongs = "Songs"; public const string FolderSounds = "Sounds"; diff --git a/Vocaluxe/Vocaluxe.csproj b/Vocaluxe/Vocaluxe.csproj index e74c7885..952a7804 100644 --- a/Vocaluxe/Vocaluxe.csproj +++ b/Vocaluxe/Vocaluxe.csproj @@ -120,7 +120,7 @@ LINUX;ARCH_X64 Off - + x86 none true @@ -128,10 +128,10 @@ prompt 4 false - WIN;ARCH_X86;PORTABLE + WIN;ARCH_X86;INSTALLER Off - + x64 none true @@ -139,10 +139,10 @@ prompt 4 false - WIN;ARCH_X64;PORTABLE + WIN;ARCH_X64;INSTALLER Off - + False ..\Output\x86\SlimDX.dll @@ -153,7 +153,7 @@ False - + ..\Output\x64\SlimDX.dll False diff --git a/VocaluxeLib/VocaluxeLib.csproj b/VocaluxeLib/VocaluxeLib.csproj index 8ddaa65f..80048cf4 100644 --- a/VocaluxeLib/VocaluxeLib.csproj +++ b/VocaluxeLib/VocaluxeLib.csproj @@ -103,8 +103,8 @@ LINUX Off - - bin\x86\PortableWin\ + + bin\ WIN true AnyCPU @@ -113,8 +113,8 @@ prompt ManagedMinimumRules.ruleset - - bin\x64\PortableWin\ + + bin\ WIN true AnyCPU @@ -188,4 +188,4 @@ --> - \ No newline at end of file +