Install FlexASIO 64-bit alongside 32-bit.

Resolves #2.
dechamps · Oct 13, 2018 · 7a7c28f · 7a7c28f
1 parent ba74c5d
commit 7a7c28f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/FlexASIO.vcxproj b/FlexASIO.vcxproj
@@ -75,6 +75,7 @@
       </RegisterOutput>
       <ModuleDefinitionFile>dll.def</ModuleDefinitionFile>
       <AdditionalDependencies>portaudio_x86.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)_x86$(TargetExt)</OutputFile>
     </Link>
     <Midl />
     <Midl>
@@ -99,6 +100,7 @@
       </RegisterOutput>
       <ModuleDefinitionFile>dll.def</ModuleDefinitionFile>
       <AdditionalDependencies>portaudio_x64.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)_x64$(TargetExt)</OutputFile>
     </Link>
     <Midl />
     <Midl>
@@ -125,6 +127,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>portaudio_x86.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>dll.def</ModuleDefinitionFile>
+      <OutputFile>$(OutDir)$(TargetName)_x86$(TargetExt)</OutputFile>
     </Link>
     <Midl>
       <OutputDirectory>$(IntDir)</OutputDirectory>
@@ -148,6 +151,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>portaudio_x64.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>dll.def</ModuleDefinitionFile>
+      <OutputFile>$(OutDir)$(TargetName)_x64$(TargetExt)</OutputFile>
     </Link>
     <Midl>
       <OutputDirectory>$(IntDir)</OutputDirectory>

diff --git a/README.md b/README.md
@@ -43,7 +43,8 @@ which can be extremely useful in some scenarios. That's what I'm using
 it for.
 
 FlexASIO should be able to run on any version of Microsoft Windows,
-even very old ones, at least in theory.
+even very old ones, at least in theory. It is compatible with 32-bit and
+64-bit ASIO host applications.
 
 ## HOW TO USE
 
@@ -57,7 +58,8 @@ control panel.
 If you don't want to use the installer, you can install it manually by
 simply registering the DLL:
 
-    regsvr32 FlexASIO.dll
+    regsvr32 FlexASIO_x64.dll
+    regsvr32 FlexASIO_x86.dll
 
 Use the `/u` switch to unregister.
 
@@ -118,9 +120,6 @@ a limitation of PortAudio.
 FlexASIO is Windows-only for now. That could change in the future, as
 PortAudio itself is cross-platform.
 
-FlexASIO is 32-bit only for now. Porting it to 64-bit is
-straightforward, I just haven't gotten around to doing it yet.
-
 ## REPORTING ISSUES
 
 Just use the GitHub issue tracker:

diff --git a/installer.iss b/installer.iss
@@ -14,20 +14,25 @@ OutputBaseFilename=FlexASIO-0.1
 
 DefaultDirName={pf}\FlexASIO
 AppendDefaultDirName=no
+ArchitecturesInstallIn64BitMode=x64
 
 LicenseFile=LICENSE.txt
 
 [Files]
-Source:"Release\FlexASIO.dll"; DestDir: "{app}"; Flags: ignoreversion regserver 32bit
+Source:"x64\Release\FlexASIO_x64.dll"; DestDir: "{app}"; Flags: ignoreversion regserver 64bit; Check: Is64BitInstallMode
+Source:"Release\FlexASIO_x86.dll"; DestDir: "{app}"; Flags: ignoreversion regserver 32bit
 Source:"LICENSE.txt"; DestDir:"{app}"; Flags: ignoreversion
 
-; PortAudio library, 32-bit DLL.
-Source:"redist\portaudio_x86.dll"; DestDir: "{app}"; Flags: ignoreversion
+; PortAudio library
+Source:"redist\portaudio_x64.dll"; DestDir: "{app}"; Flags: ignoreversion 64bit; Check: Is64BitInstallMode
+Source:"redist\portaudio_x86.dll"; DestDir: "{app}"; Flags: ignoreversion 32bit
 
 ; Microsoft Visual C++ 2017 runtime
 ; From: (Visual Studio 2017 install dir)\Community\VC\Redist\MSVC\14.15.26706
-Source: "redist\vcredist_x86.exe"; DestDir: {tmp}; Flags: deleteafterinstall
+Source: "redist\vcredist_x64.exe"; DestDir: {tmp}; Flags: deleteafterinstall 64bit; Check: Is64BitInstallMode
+Source: "redist\vcredist_x86.exe"; DestDir: {tmp}; Flags: deleteafterinstall 32bit
 
 [Run]
-Filename:"{tmp}\vcredist_x86.exe"; Parameters: "/passive"; StatusMsg: "Installing Microsoft Visual C++ 2017 runtime"
+Filename:"{tmp}\vcredist_x64.exe"; Parameters: "/passive"; StatusMsg: "Installing Microsoft Visual C++ 2017 runtime (x64)"; Flags: 64bit; Check: Is64BitInstallMode
+Filename:"{tmp}\vcredist_x86.exe"; Parameters: "/passive"; StatusMsg: "Installing Microsoft Visual C++ 2017 runtime (x86)"; Flags: 32bit