add to scons +

Author: RDMurray

installer/osara.nsi

@@ -81,11 +81,11 @@ FunctionEnd
 Section "OSARA plug-in" SecPlugin
 	SectionIn RO
 	SetOutPath "$INSTDIR\UserPlugins"
-	File "..\build\x86\reaper_osara32.dll"
+	File "..\build\x86\reaper_z_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_osara64.dll"
+		File "..\build\x86_64\reaper_z_osara64.dll"
 	${EndIf}
 	SetOutPath "$INSTDIR\KeyMaps"
 	File /oname=OSARA.ReaperKeyMap "..\config\windows\reaper-kb.ini"
@@ -115,8 +115,8 @@ Section "Replace existing key map with OSARA key map" SecKeyMap
 SectionEnd
 
 Section "Uninstall"
-	Delete "$INSTDIR\..\UserPlugins\reaper_osara32.dll"
-	Delete "$INSTDIR\..\UserPlugins\reaper_osara64.dll"
+	Delete "$INSTDIR\..\UserPlugins\reaper_z_osara32.dll"
+	Delete "$INSTDIR\..\UserPlugins\reaper_z_osara64.dll"
 	Delete "$INSTDIR\..\KeyMaps\OSARA.ReaperKeyMap"
 	Delete "$INSTDIR\uninstall.exe"
 	RMDir "$INSTDIR"

src/archBuild_sconscript

@@ -5,6 +5,7 @@
 # License: GNU General Public License version 2.0
 
 import os.path
+from tools.kb2header import buildKeymapHeader
 
 Import("env")
 
@@ -72,6 +73,7 @@ if env["PLATFORM"] == "win32":
 		"Advapi32",
 		"UIAutomationCore",
 	]
+	keymapFile = '#config/windows/reaper-kb.ini'
 
 else: # Mac
 	swellDir = env.Dir("#include/WDL/WDL/swell")
@@ -103,6 +105,7 @@ else: # Mac
 	res = env.Command(["reaper_osara.rc_mac_dlg", "reaper_osara.rc_mac_menu"], "reaper_osara.rc",
 		[[php, "include/WDL/WDL/swell/swell_resgen.php", "$SOURCE"]])
 	env.Depends("reaper_osara.cpp", res)
+	keymapFile = '#config/mac/reaper-kb.ini'
 
 def addExternalSources(dir, files):
 	dir = env.Dir(dir)
@@ -122,7 +125,10 @@ addExternalSources("#include/tinygettext/src", (
 ))
 addExternalSources("#include/fmt/src", ("format.cc", "os.cc"))
 
+env.Command('osara_keymap.h', keymapFile, buildKeymapHeader)
+
 env.SharedLibrary(
-	target="reaper_osara%s" % env["libSuffix"],
+	#Hack: Load osara after sws to allow the keyboard shortcuts to be initialized 
+	target="reaper_z_osara%s" % env["libSuffix"],
 	source=sources, LIBS=libs,
 )