Browse Source

changes for auto build

git-svn-id: svn://svn.code.sf.net/p/ditto-cp/code/trunk@567 595ec19a-5cb4-439b-94a8-42fb3063c22c
sabrogden 14 years ago
parent
commit
7c6bdee023
2 changed files with 6 additions and 5 deletions
  1. 2 2
      DittoSetup/Build Portable ZIP_10.bat
  2. 4 3
      DittoSetup/DittoSetup_10.iss

+ 2 - 2
DittoSetup/Build Portable ZIP_10.bat

@@ -16,14 +16,14 @@ if "%2" == "bit64" goto bit64
 copy ..\Release\Ditto.exe Ditto\Ditto.exe
 copy ..\Release\focus.dll Ditto\focus.dll
 copy ..\Release\Addins\*.dll Ditto\Addins\
-copy mfc-crt\* Ditto\
+copy mfc-crt_10\* Ditto\
 
 if "%2"=="" GOTO skipBit64
 if "%2"=="bit32" GOTO skipBit64	
 :bit64
 
 copy ..\Release64\Ditto.exe Ditto\Ditto.exe
-copy ..\Release64\focus64.dll Ditto\focus.dll
+copy ..\Release64\focus64.dll Ditto\focus64.dll
 copy ..\Release64\Addins\*.dll Ditto\Addins\
 copy mfc-crt64\* Ditto\
 

+ 4 - 3
DittoSetup/DittoSetup_10.iss

@@ -2,7 +2,7 @@
 #define MyAppVersion GetFileVersion("..\Release\DittoU.exe")
 #define MyAppVerName MyAppName + " " + MyAppVersion
 
-#define bit64
+;#define bit64
   
 
 [Setup]
@@ -59,8 +59,9 @@ Name: RunAtStartup; Description: Run Ditto on Windows Startup
 	Source: ..\Release64\Ditto.exe; DestDir: {app}; DestName: Ditto.exe; Flags: ignoreversion;
 	Source: ..\Release64\focus64.dll; DestDir: {app}; BeforeInstall: BeforeFocusInstall(); Flags: ignoreversion restartreplace
 	Source: ..\Release64\Addins\DittoUtil.dll; DestDir: {app}\Addins; Flags: ignoreversion
-	Source: mfc-crt64\*; DestDir: {app}
-#elif
+	Source: mfc-crt64\*; DestDir: {app}      
+#endif
+#ifndef bit64
 	Source: ..\Release\Ditto.exe; DestDir: {app}; DestName: Ditto.exe; Flags: ignoreversion;
 	Source: ..\Release\focus.dll; DestDir: {app}; BeforeInstall: BeforeFocusInstall(); Flags: ignoreversion restartreplace
 	Source: ..\Addins\DittoUtil\Release64\DittoUtil.dll; DestDir: {app}\Addins; Flags: ignoreversion