Linux: build for x86 if we're on x86
This commit is contained in:
1 parent
13f72c3cad
commit
1b86baa24d
3 files changed
+4
-3
No files matched your search
@@ -47,7 +47,7 @@ namespace Vocaluxe.Lib.Input
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if LINUX
|
#if LINUX
|
||||||
private const string _HIDApiDll = "libhidapi.so";
|
private const string _HIDApiDll = "libhidapi-libusb.so";
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -176,7 +176,7 @@ namespace Vocaluxe.Lib.Video.Acinerella
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if LINUX
|
#if LINUX
|
||||||
private const string _AcDll = "x86/libacinerella.so";
|
private const string _AcDll = "libacinerella.so";
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
|
ARCH?=$(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x64/)
|
||||||
windowsLibs = Output/gstreamer-sharp.dll Output/glib-sharp.dll
|
windowsLibs = Output/gstreamer-sharp.dll Output/glib-sharp.dll
|
||||||
all:
|
all:
|
||||||
$(MAKE) -C PitchTracker
|
$(MAKE) -C PitchTracker
|
||||||
$(MAKE) -C Vocaluxe/Lib/Video/Acinerella
|
$(MAKE) -C Vocaluxe/Lib/Video/Acinerella
|
||||||
rm -f $(windowsLibs)
|
rm -f $(windowsLibs)
|
||||||
xbuild /property:Platform=x64 /property:Configuration=ReleaseLinux
|
xbuild /property:Platform=$(ARCH) /property:Configuration=ReleaseLinux
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
xbuild /target:Clean
|
xbuild /target:Clean
|
||||||
|
|||||||
Reference in new issue
Block a user