mirror of https://git.wownero.com/dsc/mxe.git
alure: fix pkg-config detection and enable shared
This commit is contained in:
parent
ed91582f23
commit
3632f0927f
|
@ -0,0 +1,50 @@
|
||||||
|
This file is part of MXE. See LICENSE.md for licensing information.
|
||||||
|
|
||||||
|
Contains ad hoc patches for cross building.
|
||||||
|
|
||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Tony Theodore <tonyt@logyst.com>
|
||||||
|
Date: Sun, 18 Feb 2018 12:33:24 +1100
|
||||||
|
Subject: [PATCH 1/2] fix pkg-config
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index 1111111..2222222 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -14,12 +14,12 @@ INCLUDE(CheckIncludeFile)
|
||||||
|
INCLUDE(CheckIncludeFiles)
|
||||||
|
INCLUDE(CheckLibraryExists)
|
||||||
|
INCLUDE(CheckSharedFunctionExists)
|
||||||
|
-INCLUDE(FindPkgConfig)
|
||||||
|
-INCLUDE(UsePkgConfig)
|
||||||
|
INCLUDE(CheckFileOffsetBits)
|
||||||
|
|
||||||
|
PROJECT(ALURE)
|
||||||
|
|
||||||
|
+find_package(PkgConfig)
|
||||||
|
+
|
||||||
|
IF(WIN32)
|
||||||
|
SET(LIBNAME ALURE32)
|
||||||
|
ELSE(WIN32)
|
||||||
|
|
||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Tony Theodore <tonyt@logyst.com>
|
||||||
|
Date: Sun, 18 Feb 2018 12:51:07 +1100
|
||||||
|
Subject: [PATCH 2/2] disable docs
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index 1111111..2222222 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -497,9 +497,6 @@ ELSE(APPLE)
|
||||||
|
SET(INCPATH AL)
|
||||||
|
ENDIF(APPLE)
|
||||||
|
|
||||||
|
-INSTALL(DIRECTORY "${ALURE_SOURCE_DIR}/docs/html"
|
||||||
|
- DESTINATION share/doc/alure
|
||||||
|
-)
|
||||||
|
INSTALL(FILES include/AL/alure.h
|
||||||
|
DESTINATION "include/${INCPATH}"
|
||||||
|
)
|
16
src/alure.mk
16
src/alure.mk
|
@ -18,15 +18,13 @@ define $(PKG)_UPDATE
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define $(PKG)_BUILD
|
define $(PKG)_BUILD
|
||||||
cd '$(1)/build' && '$(TARGET)-cmake' \
|
cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)' \
|
||||||
-DDYNLOAD=OFF \
|
-DDYNLOAD=$(CMAKE_SHARED_BOOL) \
|
||||||
|
-DBUILD_SHARED=$(CMAKE_SHARED_BOOL) \
|
||||||
|
-DBUILD_STATIC=$(CMAKE_STATIC_BOOL) \
|
||||||
-DBUILD_EXAMPLES=OFF \
|
-DBUILD_EXAMPLES=OFF \
|
||||||
-DFLUIDSYNTH=OFF \
|
-DFLUIDSYNTH=OFF \
|
||||||
-DCMAKE_C_FLAGS="-DAL_LIBTYPE_STATIC -DALURE_STATIC_LIBRARY" \
|
-DSTATIC_CFLAGS="-DAL_LIBTYPE_STATIC"
|
||||||
-DCMAKE_CXX_FLAGS="-DAL_LIBTYPE_STATIC -DALURE_STATIC_LIBRARY" \
|
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' VERBOSE=1
|
||||||
..
|
$(MAKE) -C '$(BUILD_DIR)' -j 1 install
|
||||||
$(MAKE) -C '$(1)/build' -j $(JOBS) VERBOSE=1
|
|
||||||
$(MAKE) -C '$(1)/build' -j $(JOBS) install
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
$(PKG)_BUILD_SHARED =
|
|
||||||
|
|
Loading…
Reference in New Issue