xp and icon support

etotheipi · Feb 22, 2014 · 7a4c033 · 7a4c033
1 parent abe3933
commit 7a4c033
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/build_installer.bat b/build_installer.bat
@@ -4,6 +4,5 @@ C:\Python27\Lib\site-packages\PyQt4\pyrcc4.exe -o ..\..\qrc_img_resources.py ..\
 python ..\..\setup.py py2exe --includes sip,hashlib,json,twisted -d ..\..\ArmoryStandalone
 copy ..\..\img\*.ico ..\..\ArmoryStandalone
 copy ..\..\img\armory_logo*.png ..\..\ArmoryStandalone
-rtc /F:..\..\edit_icons.rts
 python ..\..\writeNSISCompilerArgs.py
 makensis.exe ..\..\ArmorySetup.nsi
diff --git a/cppForSwig/BinaryData.h b/cppForSwig/BinaryData.h
@@ -10,8 +10,8 @@
 
 #include <stdio.h>
 #if defined(_MSC_VER) || defined(__MINGW32__)
-   #ifdef _MSC_PLATFORM_TOOLSET == 100
-      #include <stdint.h>
+	#if _MSC_PLATFORM_TOOLSET==100
+		#include <stdint.h>
    #endif
 #else
    #include <stdlib.h>

diff --git a/cppForSwig/BitcoinArmory.sln b/cppForSwig/BitcoinArmory.sln
@@ -6,6 +6,11 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptopp", "cryptopp\cryptopp.vcxproj", "{B1055DA3-83CE-47BF-98E6-2850E3411D39}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BitcoinArmory_SwigDLL", "BitcoinArmory_SwigDLL\BitcoinArmory_SwigDLL.vcxproj", "{19329A6B-FE96-4917-B69A-2B0375C12017}"
+	ProjectSection(ProjectDependencies) = postProject
+		{D35F732D-55D7-4037-9C6D-E141F740F802} = {D35F732D-55D7-4037-9C6D-E141F740F802}
+		{01CD1176-66F7-44AB-9E7B-8AEECC9915E8} = {01CD1176-66F7-44AB-9E7B-8AEECC9915E8}
+		{B1055DA3-83CE-47BF-98E6-2850E3411D39} = {B1055DA3-83CE-47BF-98E6-2850E3411D39}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BitcoinArmory_CppTests", "BitcoinArmory_CppTests\BitcoinArmory_CppTests.vcxproj", "{D9733F9E-BE30-466F-B100-B686DF663C4D}"
 EndProject

diff --git a/cppForSwig/BlockUtils.cpp b/cppForSwig/BlockUtils.cpp
@@ -3253,10 +3253,10 @@ vector<TxRef*> BlockDataManager_LevelDB::findAllNonStdTx(void)
 }
 */
 
-static bool scanFor(std::istream &in, const uint8_t * bytes, unsigned len)
+static bool scanFor(std::istream &in, const uint8_t * bytes, const unsigned len)
 {
    unsigned matched=0; // how many bytes we've matched so far
-   uint8_t ahead[len]; // the bytes matched
+   uint8_t *ahead = new uint8_t[len]; // the bytes matched
 
    in.read((char*)ahead, len);
    unsigned count = in.gcount();
@@ -3276,11 +3276,16 @@ static bool scanFor(std::istream &in, const uint8_t * bytes, unsigned len)
          }
       }
       if (found)
+		{
+			delete [] ahead;
          return true;
+		}
 
       ahead[offset++%len] = in.get();
 
    } while (!in.eof());
+
+	delete [] ahead;
    return false;
 }
 

diff --git a/setup.py b/setup.py
@@ -10,7 +10,11 @@
 setup( options = opts, windows = [
                         {
                             "script": "../../ArmoryQt.py",
-                            "icon_resources": [(1, "../../img/armory256x256.ico")]
+                            "icon_resources": [(1, "../../img/armory64x64.ico"),
+                                               (1, "../../img/armory48x48.ico"),
+                                               (1, "../../img/armory32x32.ico"),
+                                               (1, "../../img/armory24x24.ico"),
+                                               (1, "../../img/armory16x16.ico") ]
                         }
                 ],
     )