Fixing scripts...

Author: Meychi

CI/build.cmd

@@ -12,16 +12,17 @@ set PATH=%PATH%;C:\Program Files\7-Zip\
 if %errorlevel% neq 0 goto :error
 
 :: Build the PluginCore
-msbuild PluginCore\PluginCore.csproj /p:Configuration=Release /p:Platform=x86 /t:Rebuild
+msbuild PluginCore\PluginCore.csproj /p:Configuration=Release /p:Platform="Any CPU" /t:Rebuild
 
 :: Check for build errors
 if %errorlevel% neq 0 goto :error
 
 :: Extract version from HEAD
 call SetVersion.bat
 
-:: Build the solution
+:: Build the solutions
 msbuild FlashDevelop.sln /p:Configuration=Release /p:Platform=x86 /t:Rebuild
+msbuild FlashDevelop.sln /p:Configuration=Release /p:Platform="Any CPU" /t:Rebuild
 
 :: Check for build errors
 if %errorlevel% neq 0 goto :error
@@ -52,16 +53,17 @@ for /d %%G in ("FlashDevelop\Bin\Debug\Projects\*ActionScript 3*") do rd /s /q "
 xcopy Distros\HaxeDevelop /s /e /y
 
 :: Build the PluginCore
-msbuild PluginCore\PluginCore.csproj /p:Configuration=Release /p:Platform=x86 /t:Rebuild
+msbuild PluginCore\PluginCore.csproj /p:Configuration=Release /p:Platform="Any CPU" /t:Rebuild
 
 :: Check for build errors
 if %errorlevel% neq 0 goto :error
 
 :: Extract version from HEAD
 call SetVersion.bat
 
-:: Build the solution
+:: Build the solutions
 msbuild FlashDevelop.sln /p:Configuration=Release /p:Platform=x86 /t:Rebuild
+msbuild FlashDevelop.sln /p:Configuration=Release /p:Platform="Any CPU" /t:Rebuild
 
 :: Check for build errors
 if %errorlevel% neq 0 goto :error

CI/buildl.cmd

@@ -22,16 +22,17 @@ del FlashDevelop\Installer\Binary\*.zip /Q
 if %errorlevel% neq 0 goto :error
 
 :: Build the PluginCore
-msbuild PluginCore\PluginCore.csproj /p:Configuration=Release /p:Platform=x86 /t:Rebuild
+msbuild PluginCore\PluginCore.csproj /p:Configuration=Release /p:Platform="Any CPU" /t:Rebuild
 
 :: Check for build errors
 if %errorlevel% neq 0 goto :error
 
 :: Extract version from HEAD
 call SetVersion.bat
 
-:: Build the solution
+:: Build the solutions
 msbuild FlashDevelop.sln /p:Configuration=Release /p:Platform=x86 /t:Rebuild
+msbuild FlashDevelop.sln /p:Configuration=Release /p:Platform="Any CPU" /t:Rebuild
 
 :: Check for build errors
 if %errorlevel% neq 0 goto :error
@@ -62,16 +63,17 @@ for /d %%G in ("FlashDevelop\Bin\Debug\Projects\*ActionScript 3*") do rd /s /q "
 xcopy Distros\HaxeDevelop /s /e /y
 
 :: Build the PluginCore
-msbuild PluginCore\PluginCore.csproj /p:Configuration=Release /p:Platform=x86 /t:Rebuild
+msbuild PluginCore\PluginCore.csproj /p:Configuration=Release /p:Platform="Any CPU" /t:Rebuild
 
 :: Check for build errors
 if %errorlevel% neq 0 goto :error
 
 :: Extract version from HEAD
 call SetVersion.bat
 
-:: Build the solution
+:: Build the solutions
 msbuild FlashDevelop.sln /p:Configuration=Release /p:Platform=x86 /t:Rebuild
+msbuild FlashDevelop.sln /p:Configuration=Release /p:Platform="Any CPU" /t:Rebuild
 
 :: Check for build errors
 if %errorlevel% neq 0 goto :error

FlashDevelop/Installer/Installer.nsi

@@ -550,8 +550,11 @@ Section "un.${DIST_NAME}" UninstMain
 	Delete "$INSTDIR\Exceptions.log"
 	Delete "$INSTDIR\${DIST_NAME}.exe"
 	Delete "$INSTDIR\${DIST_NAME}.exe.config"
+	Delete "$INSTDIR\${DIST_NAME}x64.exe"
+	Delete "$INSTDIR\${DIST_NAME}x64.exe.config"
 	Delete "$INSTDIR\PluginCore.dll"
 	Delete "$INSTDIR\SciLexer.dll"
+	Delete "$INSTDIR\SciLexer64.dll"
 	Delete "$INSTDIR\Scripting.dll"
 	Delete "$INSTDIR\Antlr3.dll"
 	Delete "$INSTDIR\SwfOp.dll"