Linux: build for x86 if we're on x86

This commit is contained in:
derivator committed 2015-03-01 00:34:00 +01:00
1 parent 13f72c3cad
commit 1b86baa24d
3 files changed
+4 -3

No files matched your search

+1 -1
View File
@@ -47,7 +47,7 @@ namespace Vocaluxe.Lib.Input
#endif
#if LINUX
private const string _HIDApiDll = "libhidapi.so";
private const string _HIDApiDll = "libhidapi-libusb.so";
#endif
#endif
+1 -1
View File
@@ -176,7 +176,7 @@ namespace Vocaluxe.Lib.Video.Acinerella
#endif
#if LINUX
private const string _AcDll = "x86/libacinerella.so";
private const string _AcDll = "libacinerella.so";
#endif
#endif
+2 -1
View File
@@ -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
all:
$(MAKE) -C PitchTracker
$(MAKE) -C Vocaluxe/Lib/Video/Acinerella
rm -f $(windowsLibs)
xbuild /property:Platform=x64 /property:Configuration=ReleaseLinux
xbuild /property:Platform=$(ARCH) /property:Configuration=ReleaseLinux
clean:
xbuild /target:Clean