diff options
| author | Tony Theodore <tonyt@logyst.com> | 2014-02-03 07:22:54 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2014-02-09 07:34:19 (GMT) |
| commit | 47361fa75035d78117ec2c97a3b84be3a5259820 (patch) | |
| tree | e73238e6560f197ab1e6505e8e62bae0070126fd /src | |
| parent | 5a18b2786be138604e82a54f84e131536371781b (diff) | |
| download | mxe-47361fa75035d78117ec2c97a3b84be3a5259820.zip mxe-47361fa75035d78117ec2c97a3b84be3a5259820.tar.gz mxe-47361fa75035d78117ec2c97a3b84be3a5259820.tar.bz2 | |
Makefile docs and pkgconf: add support for shared|static variants
Diffstat (limited to 'src')
| -rw-r--r-- | src/pkgconf.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pkgconf.mk b/src/pkgconf.mk index cca6855..a5d4146 100644 --- a/src/pkgconf.mk +++ b/src/pkgconf.mk @@ -41,7 +41,7 @@ define $(PKG)_BUILD_COMMON # create pkg-config script (echo '#!/bin/sh'; \ - echo 'PKG_CONFIG_PATH="$(PREFIX)/$(TARGET)/qt5/lib/pkgconfig":"$$PKG_CONFIG_PATH_$(subst -,_,$(TARGET))" PKG_CONFIG_LIBDIR='\''$(PREFIX)/$(TARGET)/lib/pkgconfig'\'' exec '$(PREFIX)/$(TARGET)/bin/pkg-config' --static "$$@"') \ + echo 'PKG_CONFIG_PATH="$(PREFIX)/$(TARGET)/qt5/lib/pkgconfig":"$$PKG_CONFIG_PATH_$(subst .,_,$(subst -,_,$(TARGET)))" PKG_CONFIG_LIBDIR='\''$(PREFIX)/$(TARGET)/lib/pkgconfig'\'' exec '$(PREFIX)/$(TARGET)/bin/pkg-config' $(if $(BUILD_STATIC),--static) "$$@"') \ > '$(PREFIX)/bin/$(TARGET)-pkg-config' chmod 0755 '$(PREFIX)/bin/$(TARGET)-pkg-config' @@ -49,7 +49,7 @@ define $(PKG)_BUILD_COMMON [ -d '$(dir $(CMAKE_TOOLCHAIN_FILE))' ] || mkdir -p '$(dir $(CMAKE_TOOLCHAIN_FILE))' (echo 'set(CMAKE_SYSTEM_NAME Windows)'; \ echo 'set(MSYS 1)'; \ - echo 'set(BUILD_SHARED_LIBS OFF)'; \ + echo 'set(BUILD_SHARED_LIBS $(if $(BUILD_SHARED),ON,OFF))'; \ echo 'set(CMAKE_BUILD_TYPE Release)'; \ echo 'set(CMAKE_FIND_ROOT_PATH $(PREFIX)/$(TARGET))'; \ echo 'set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)'; \ |