enable shared build (fixes for biosig, libxdf, sigviewer )

mxe · Apr 7, 2024 · 60201dd · 60201dd
1 parent daccbf9
commit 60201dd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/src/biosig.mk b/src/biosig.mk
@@ -49,20 +49,20 @@ define $(PKG)_BUILD_POST
 
     $(INSTALL) -m644 '$(1)/biosig4c++/libbiosig.a'		'$(PREFIX)/$(TARGET)/lib/'
     $(INSTALL) -m644 '$(1)/biosig4c++/libbiosig.def'		'$(PREFIX)/$(TARGET)/lib/'
-    # $(INSTALL) -m644 '$(1)/biosig4c++/libbiosig.dll.a'	'$(PREFIX)/$(TARGET)/lib/'
+    -$(INSTALL) -m644 '$(1)/biosig4c++/libbiosig.dll.a'		'$(PREFIX)/$(TARGET)/lib/'
     $(INSTALL) -m644 '$(1)/biosig4c++/libbiosig.dll'		'$(PREFIX)/$(TARGET)/bin/'
     $(INSTALL) -m644 '$(1)/biosig4c++/libbiosig-3.dll'		'$(PREFIX)/$(TARGET)/bin/'
 
     $(INSTALL) -m644 '$(1)/biosig4c++/libgdf.a'			'$(PREFIX)/$(TARGET)/lib/'
     $(INSTALL) -m644 '$(1)/biosig4c++/libgdf.def'		'$(PREFIX)/$(TARGET)/lib/'
-    # $(INSTALL) -m644 '$(1)/biosig4c++/libgdf.dll.a'		'$(PREFIX)/$(TARGET)/lib/'
+    -$(INSTALL) -m644 '$(1)/biosig4c++/libgdf.dll.a'		'$(PREFIX)/$(TARGET)/lib/'
     $(INSTALL) -m644 '$(1)/biosig4c++/libgdf-3.dll'		'$(PREFIX)/$(TARGET)/bin/'
     $(INSTALL) -m644 '$(1)/biosig4c++/libgdf.dll'		'$(PREFIX)/$(TARGET)/bin/'
 
     $(INSTALL) -m644 '$(1)/biosig4c++/physicalunits.h'		'$(PREFIX)/$(TARGET)/include/'
     $(INSTALL) -m644 '$(1)/biosig4c++/libphysicalunits.a'	'$(PREFIX)/$(TARGET)/lib/'
     $(INSTALL) -m644 '$(1)/biosig4c++/libphysicalunits.def'	'$(PREFIX)/$(TARGET)/lib/'
-    # $(INSTALL) -m644 '$(1)/biosig4c++/libphysicalunits.dll.a'	'$(PREFIX)/$(TARGET)/lib/'
+    -$(INSTALL) -m644 '$(1)/biosig4c++/libphysicalunits.dll.a'	'$(PREFIX)/$(TARGET)/lib/'
     $(INSTALL) -m644 '$(1)/biosig4c++/libphysicalunits-3.dll'	'$(PREFIX)/$(TARGET)/bin/'
     $(INSTALL) -m644 '$(1)/biosig4c++/libphysicalunits.dll'	'$(PREFIX)/$(TARGET)/bin/'
 
@@ -78,7 +78,6 @@ define $(PKG)_BUILD_POST
 		include/biosig.h include/biosig-dev.h include/biosig2.h include/gdftime.h  \
 		lib/libbiosig.a lib/libbiosig.def bin/libbiosig.dll lib/libbiosig.dll.a \
 		lib/libgdf.a lib/libgdf.def bin/libgdf.dll lib/libgdf.dll.a \
-		lib/libz.a lib/libcholmod.a lib/libiconv.a \
 		include/iconv.h \
 		include/physicalunits.h \
 		lib/libphysicalunits.a lib/libphysicalunits.def bin/libphysicalunits.dll lib/libphysicalunits.dll.a
@@ -94,7 +93,6 @@ define $(PKG)_BUILD_POST
     cd $(PREFIX)/$(TARGET) && cp -r \
 		lib/libbiosig.a lib/libbiosig.def bin/libbiosig.dll \
 		lib/libgdf.a lib/libgdf.def bin/libgdf.dll \
-		lib/libz.a lib/libcholmod.a lib/libiconv.a \
 		lib/libphysicalunits.a lib/libphysicalunits.def bin/libphysicalunits.dll \
 		$(PREFIX)/release/$(TARGET)/lib/
     -cd $(PREFIX)/$(TARGET) && cp -r \
@@ -111,12 +109,6 @@ define $(PKG)_BUILD_POST
 
     cd '$(1)/biosig4c++/win32' && zip $(PREFIX)/$($(PKG)_SUBDIR).$(TARGET).zip *.bat README
 
-    #exit -1
-    ### these cause problems when compiling stimfit
-    #rm -rf '$(PREFIX)/$(TARGET)/lib/libphysicalunits.dll.a' \
-    #	'$(PREFIX)/$(TARGET)/lib/libbiosig.dll.a' \
-    #	'$(PREFIX)/$(TARGET)/lib/libgdf.dll.a'
-
 endef
 
 

diff --git a/src/libxdf.mk b/src/libxdf.mk
@@ -27,6 +27,7 @@ define $(PKG)_BUILD
 
 	$(MAKE) -C '$(1)/native_build'
 
-	$(INSTALL) '$(1)/xdf.h'    '$(PREFIX)/$(TARGET)/include/'
-	$(INSTALL) '$(1)'/native_build/libxdf.$(if $(BUILD_STATIC),"a","dll*") '$(PREFIX)/$(TARGET)/lib/'
+	$(INSTALL) '$(1)/xdf.h'    			'$(PREFIX)/$(TARGET)/include/'
+	$(INSTALL) '$(1)'/native_build/libxdf.$(if $(BUILD_STATIC),"a","dll.a") '$(PREFIX)/$(TARGET)/lib/'
+	-$(INSTALL) '$(1)'/native_build/libxdf.dll	'$(PREFIX)/$(TARGET)/bin/'
 endef
diff --git a/src/sigviewer.mk b/src/sigviewer.mk
@@ -20,7 +20,7 @@ endef
 define $(PKG)_BUILD
     #    LIBS='-l$(PREFIX)/$(TARGET)/lib/libtinyxml.a -l$(PREFIX)/$(TARGET)/$($(PKG)_QT_DIR)/plugins/platforms/libqwindows.a'
     cd '$(1)' && CFLAGS=-fstack-protector CXXFLAGS=-fstack-protector && \
-        LIBS='-l$(PREFIX)/$(TARGET)/$($(PKG)_QT_DIR)/plugins/platforms/libqwindows.a' \
+        LIBS='-l$(PREFIX)/$(TARGET)/$($(PKG)_QT_DIR)/plugins/platforms/libqwindows.a -l$(PREFIX)/$(TARGET)/lib/libiconv.a' \
         $(PREFIX)/$(TARGET)/$($(PKG)_QT_DIR)/bin/qmake sigviewer.pro
 
     $(MAKE) -C '$(1)'