revert file name hack

Author: RDMurray

installer/osara.nsi

@@ -81,11 +81,11 @@ FunctionEnd
 Section "OSARA plug-in" SecPlugin
 	SectionIn RO
 	SetOutPath "$INSTDIR\UserPlugins"
-	File "..\build\x86\reaper_z_osara32.dll"
+	File "..\build\x86\reaper_osara32.dll"
 	; Installing the 64 bit dll on a 32 bit system causes an error when REAPER starts up.
 	; However, it's fine on a 64 bit system even with 32 bit REAPER.
 	${If} ${RunningX64}
-		File "..\build\x86_64\reaper_z_osara64.dll"
+		File "..\build\x86_64\reaper_osara64.dll"
 	${EndIf}
 	SetOutPath "$INSTDIR\KeyMaps"
 	File /oname=OSARA.ReaperKeyMap "..\config\windows\reaper-kb.ini"
@@ -116,8 +116,8 @@ Section "Replace existing key map with OSARA key map" SecKeyMap
 SectionEnd
 
 Section "Uninstall"
-	Delete "$INSTDIR\..\UserPlugins\reaper_z_osara32.dll"
-	Delete "$INSTDIR\..\UserPlugins\reaper_z_osara64.dll"
+	Delete "$INSTDIR\..\UserPlugins\reaper_osara32.dll"
+	Delete "$INSTDIR\..\UserPlugins\reaper_osara64.dll"
 	Delete "$INSTDIR\..\KeyMaps\OSARA.ReaperKeyMap"
 	Delete "$INSTDIR\uninstall.exe"
 	RMDir "$INSTDIR"

src/archBuild_sconscript

@@ -115,7 +115,6 @@ else: # Mac
 		"config.rc",
 		[[php, "include/WDL/WDL/swell/swell_resgen.php", "$SOURCE"]])
 	env.Depends("reaper_osara.cpp", [res, dialogRes])
-	env.Depends("reaper_osara.cpp", res)
 	keymapFile = '#config/mac/reaper-kb.ini'
 
 def addExternalSources(dir, files):
@@ -139,7 +138,6 @@ addExternalSources("#include/fmt/src", ("format.cc", "os.cc"))
 env.Command('osara_keymap.h', keymapFile, buildKeymapHeader)
 
 env.SharedLibrary(
-	#Hack: Load osara after sws to allow the keyboard shortcuts to be initialized 
-	target="reaper_z_osara%s" % env["libSuffix"],
+	target="reaper_osara%s" % env["libSuffix"],
 	source=sources, LIBS=libs,
 )