114 lines
4.6 KiB
Diff
114 lines
4.6 KiB
Diff
From 73ff28c3ee5b737303871268a5487db0fcffc0f6 Mon Sep 17 00:00:00 2001
|
|
From: Nikolay Amiantov <ab@fmap.me>
|
|
Date: Wed, 17 Feb 2016 14:37:31 +0300
|
|
Subject: [PATCH 1/2] Don't use static library
|
|
|
|
---
|
|
octoprint_m3dfio/__init__.py | 67 +-----------------------------------------
|
|
shared library source/Makefile | 6 ++--
|
|
2 files changed, 5 insertions(+), 68 deletions(-)
|
|
|
|
diff --git a/octoprint_m3dfio/__init__.py b/octoprint_m3dfio/__init__.py
|
|
index 5e5369b..9f59768 100644
|
|
--- a/octoprint_m3dfio/__init__.py
|
|
+++ b/octoprint_m3dfio/__init__.py
|
|
@@ -764,72 +764,7 @@ class M3DFioPlugin(
|
|
# Set file locations
|
|
self.setFileLocations()
|
|
|
|
- # Check if running on Linux
|
|
- if platform.uname()[0].startswith("Linux") :
|
|
-
|
|
- # Check if running on a Raspberry Pi
|
|
- if platform.uname()[4].startswith("armv6l") and self.getCpuHardware() == "BCM2708" :
|
|
-
|
|
- # Set shared library
|
|
- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm1176jzf-s.so")
|
|
-
|
|
- # Otherwise check if running on a Raspberry Pi 2
|
|
- elif platform.uname()[4].startswith("armv7l") and self.getCpuHardware() == "BCM2709" :
|
|
-
|
|
- # Set shared library
|
|
- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm_cortex-a7.so")
|
|
-
|
|
- # Otherwise check if running on an ARM7 device
|
|
- elif platform.uname()[4].startswith("armv7") :
|
|
-
|
|
- # Set shared library
|
|
- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm7.so")
|
|
-
|
|
- # Otherwise check if using an i386 or x86-64 device
|
|
- elif platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64") :
|
|
-
|
|
- # Check if Python is running as 32-bit
|
|
- if platform.architecture()[0].startswith("32") :
|
|
-
|
|
- # Set shared library
|
|
- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.so")
|
|
-
|
|
- # Otherwise check if Python is running as 64-bit
|
|
- elif platform.architecture()[0].startswith("64") :
|
|
-
|
|
- # Set shared library
|
|
- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.so")
|
|
-
|
|
- # Otherwise check if running on Windows and using an i386 or x86-64 device
|
|
- elif platform.uname()[0].startswith("Windows") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) :
|
|
-
|
|
- # Check if Python is running as 32-bit
|
|
- if platform.architecture()[0].startswith("32") :
|
|
-
|
|
- # Set shared library
|
|
- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.dll")
|
|
-
|
|
- # Otherwise check if Python is running as 64-bit
|
|
- elif platform.architecture()[0].startswith("64") :
|
|
-
|
|
- # Set shared library
|
|
- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.dll")
|
|
-
|
|
- # Otherwise check if running on OS X and using an i386 or x86-64 device
|
|
- elif platform.uname()[0].startswith("Darwin") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) :
|
|
-
|
|
- # Check if Python is running as 32-bit
|
|
- if platform.architecture()[0].startswith("32") :
|
|
-
|
|
- # Set shared library
|
|
- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.dylib")
|
|
-
|
|
- # Otherwise check if Python is running as 64-bit
|
|
- elif platform.architecture()[0].startswith("64") :
|
|
-
|
|
- # Set shared library
|
|
- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.dylib")
|
|
-
|
|
+ self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/../../../libpreprocessor.so")
|
|
# Check if shared library was set
|
|
if self.sharedLibrary :
|
|
|
|
diff --git a/shared library source/Makefile b/shared library source/Makefile
|
|
index 4062a91..89dab71 100644
|
|
--- a/shared library source/Makefile
|
|
+++ b/shared library source/Makefile
|
|
@@ -58,13 +58,15 @@ ifeq ($(TARGET_PLATFORM), OSX64)
|
|
CFLAGS = -fPIC -m64 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER)
|
|
endif
|
|
|
|
+PROG = lib$(LIBRARY_NAME).so
|
|
+CC = g++
|
|
SRCS = preprocessor.cpp gcode.cpp vector.cpp
|
|
-CFLAGS += -Wall -std=c++11 -fvisibility=hidden -shared
|
|
+CFLAGS = -O3 -fPIC -Wall -std=c++11 -fvisibility=hidden -shared
|
|
|
|
all: $(PROG)
|
|
|
|
$(PROG): $(SRCS)
|
|
- $(CC) $(CFLAGS) -o ../octoprint_m3dfio/static/libraries/$(PROG) $(SRCS)
|
|
+ $(CC) $(CFLAGS) -o $(PROG) $(SRCS)
|
|
|
|
clean:
|
|
rm -f ../octoprint_m3dfio/static/libraries/$(PROG)
|
|
--
|
|
2.7.0
|
|
|