Removed pointless 64-bit configuration tool and unified driver names …

…across platforms
kode54 · Aug 27, 2012 · 996afe3 · 996afe3
1 parent 4f10f2c
commit 996afe3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 18 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,6 @@
+3.10
+  installer/driver
+  * removed 64-bit configuration tool and unified driver name across platforms
 3.9
   installer
   * installs 64-bit driver and configuration tool on 64-bit systems

diff --git a/bassmididrv.nsi b/bassmididrv.nsi
@@ -85,7 +85,6 @@ Section "Needed (required)"
    File output\64\bass_mpc.dll
    File output\64\bassmidi.dll
    File output\64\bassmididrv.dll
-   File output\64\bassmididrvcfg.exe
    ;check if already installed
    StrCpy  $1 "0"
 LOOP1:
@@ -172,7 +171,6 @@ REGDONE:
    CreateShortCut "$SMPROGRAMS\BASSMIDI System Synth\Uninstall.lnk" "$WINDIR\SysWow64\bassmididrv\bassmididrvuninstall.exe" "" "$WINDIR\SysWow64\bassmididrvuninstall.exe" 0
    CreateShortCut "$SMPROGRAMS\BASSMIDI System Synth\SoundFont Packer.lnk" "$WINDIR\SysWow64\bassmididrv\sfpacker.exe" "" "$WINDIR\SysWow64\sfpacker.exe" 0
    CreateShortCut "$SMPROGRAMS\BASSMIDI System Synth\Configure BASSMIDI Driver.lnk" "$WINDIR\SysWow64\bassmididrv\bassmididrvcfg.exe" "" "$WINDIR\SysWow64\bassmididrv\bassmididrvcfg.exe" 0
-   CreateShortCut "$SMPROGRAMS\BASSMIDI System Synth\Configure BASSMIDI Driver (64-bit).lnk" "$WINDIR\System32\bassmididrv\bassmididrvcfg.exe" "" "$WINDIR\System32\bassmididrv\bassmididrvcfg.exe" 0
    ${Else}
    WriteUninstaller "$WINDIR\System32\bassmididrvuninstall.exe"
    WriteRegStr HKLM "Software\BASSMIDI Driver" "path" "$WINDIR\System32\bassmididrv"

diff --git a/bassmididrv_source/bassmididrv.cpp b/bassmididrv_source/bassmididrv.cpp
@@ -307,18 +307,9 @@ HRESULT modGetCaps(UINT uDeviceID, MIDIOUTCAPS* capsPtr, DWORD capsSize) {
 	MIDIOUTCAPSW * myCapsW;
 	MIDIOUTCAPS2A * myCaps2A;
 	MIDIOUTCAPS2W * myCaps2W;
-#if defined(AMD64)
-	 // WinDDK
-	CHAR synthName[] = "BASSMIDI Driver 64";
-	WCHAR synthNameW[] = L"BASSMIDI Driver 64";
-#elif defined(_WIN64)
-	//VisualStudio
-	CHAR synthName[] = "BASSMIDI Driver 64";
-	WCHAR synthNameW[] = L"BASSMIDI Driver 64";
-#else
 	CHAR synthName[] = "BASSMIDI Driver";
 	WCHAR synthNameW[] = L"BASSMIDI Driver";
-#endif
+
 	CHAR synthPortA[] = " (port A)\0";
 	WCHAR synthPortAW[] = L" (port A)\0";
 

diff --git a/drivercfg/drivercfg.sln b/drivercfg/drivercfg.sln
@@ -6,19 +6,13 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{AF13E822-617D-4B1E-A092-C9C9B07C1E05}.Debug|Win32.ActiveCfg = Debug|Win32
 		{AF13E822-617D-4B1E-A092-C9C9B07C1E05}.Debug|Win32.Build.0 = Debug|Win32
-		{AF13E822-617D-4B1E-A092-C9C9B07C1E05}.Debug|x64.ActiveCfg = Debug|x64
-		{AF13E822-617D-4B1E-A092-C9C9B07C1E05}.Debug|x64.Build.0 = Debug|x64
 		{AF13E822-617D-4B1E-A092-C9C9B07C1E05}.Release|Win32.ActiveCfg = Release|Win32
 		{AF13E822-617D-4B1E-A092-C9C9B07C1E05}.Release|Win32.Build.0 = Release|Win32
-		{AF13E822-617D-4B1E-A092-C9C9B07C1E05}.Release|x64.ActiveCfg = Release|x64
-		{AF13E822-617D-4B1E-A092-C9C9B07C1E05}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE