Accidentally broke the MSVS project. Fixed.

torusJKL · Jan 31, 2012 · e9b7a5b · e9b7a5b
1 parent 6ffa636
commit e9b7a5b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 155 deletions.
diff --git a/cppForSwig/BitcoinArmoryEngine_MSVS2005.sln → cppForSwig/ArmoryEngine_MSVS2005.sln b/cppForSwig/BitcoinArmoryEngine_MSVS2005.sln → cppForSwig/ArmoryEngine_MSVS2005.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BitcoinArmoryEngine_MSVS2005", "BitcoinArmoryEngine_MSVS2005.vcproj", "{9B73A6D3-E0A1-469F-B473-420029B3F380}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArmoryEngine_MSVS2005", "ArmoryEngine_MSVS2005.vcproj", "{9B73A6D3-E0A1-469F-B473-420029B3F380}"
 	ProjectSection(ProjectDependencies) = postProject
 		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF} = {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}
 	EndProjectSection

diff --git a/...rSwig/BitcoinArmoryEngine_MSVS2005.vcproj → cppForSwig/ArmoryEngine_MSVS2005.vcproj b/...rSwig/BitcoinArmoryEngine_MSVS2005.vcproj → cppForSwig/ArmoryEngine_MSVS2005.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="BitcoinArmoryEngine_MSVS2005"
+	Name="ArmoryEngine_MSVS2005"
 	ProjectGUID="{9B73A6D3-E0A1-469F-B473-420029B3F380}"
-	RootNamespace="BitcoinArmoryEngine_MSVS2005"
+	RootNamespace="ArmoryEngine_MSVS2005"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>

diff --git a/cppForSwig/cryptopp/cryptlib.vcproj b/cppForSwig/cryptopp/cryptlib.vcproj
@@ -4427,154 +4427,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="mars.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL-Import Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL-Import Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL-Import Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL-Import Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="marss.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL-Import Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL-Import Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL-Import Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL-Import Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="md2.cpp"
 				>
@@ -9274,10 +9126,6 @@
 				RelativePath="luc.h"
 				>
 			</File>
-			<File
-				RelativePath="mars.h"
-				>
-			</File>
 			<File
 				RelativePath="md2.h"
 				>

diff --git a/setup.py b/setup.py
@@ -0,0 +1,9 @@
+#! /usr/bin/python
+from distutils.core import setup
+import py2exe
+
+
+setup( windows = ['../ArmoryQt.py'] )
+   #options = {'py2exe': {'bundle_files': 1}}, \
+   #zipfile = None )
+