diff options
| author | Tony Theodore <tonyt@logyst.com> | 2014-12-09 10:16:46 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2014-12-09 10:16:46 (GMT) |
| commit | 7f96b7aa8bb3e6da1d0da6719c60bf9167284cf5 (patch) | |
| tree | 44d2621c5cfefe842bea445fefa6e6bb8669b718 /src/boost.mk | |
| parent | 839eaf513b0068589a531e9a7a5525dc206860bd (diff) | |
| download | mxe-7f96b7aa8bb3e6da1d0da6719c60bf9167284cf5.zip mxe-7f96b7aa8bb3e6da1d0da6719c60bf9167284cf5.tar.gz mxe-7f96b7aa8bb3e6da1d0da6719c60bf9167284cf5.tar.bz2 | |
Revert "boost:fix for naming convention and removal of previous libs"
This reverts commit 2ff374c64ea4eba51a7f46d8439cfbd68cfd638d.
Diffstat (limited to 'src/boost.mk')
| -rw-r--r-- | src/boost.mk | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/boost.mk b/src/boost.mk index ae57abd..574a628 100644 --- a/src/boost.mk +++ b/src/boost.mk @@ -20,7 +20,7 @@ endef define $(PKG)_BUILD # old version appears to interfere rm -rf '$(PREFIX)/$(TARGET)/include/boost/' - rm -f "$(PREFIX)/$(TARGET)/lib/libboost"* + rm -f "$(PREFIX)/$(TARGET)/lib/libboost*" # create user-config echo 'using gcc : mxe : $(TARGET)-g++ : <rc>$(TARGET)-windres <archiver>$(TARGET)-ar <ranlib>$(TARGET)-ranlib ;' > '$(1)/user-config.jam' @@ -39,8 +39,8 @@ define $(PKG)_BUILD address-model=$(BITS) \ architecture=x86 \ binary-format=pe \ - link=@boost-link@ \ - runtime-link=@boost-link@ \ + link=$(if $(BUILD_STATIC),static,shared) \ + runtime-link=$(if $(BUILD_STATIC),static,shared) \ target-os=windows \ threadapi=win32 \ threading=multi \ @@ -69,13 +69,8 @@ define $(PKG)_BUILD -W -Wall -Werror -ansi -U__STRICT_ANSI__ -pedantic \ '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-boost.exe' \ -DBOOST_THREAD_USE_LIB \ - -lboost_serialization@boost-lib-suffix@ \ - -lboost_thread_win32@boost-lib-suffix@ \ - -lboost_system@boost-lib-suffix@ \ - -lboost_chrono@boost-lib-suffix@ + -lboost_serialization-mt \ + -lboost_thread_win32-mt \ + -lboost_system-mt \ + -lboost_chrono-mt endef - -$(PKG)_BUILD_STATIC = $(subst @boost-link@,static,\ - $(subst @boost-lib-suffix@,-mt-s,$($(PKG)_BUILD))) -$(PKG)_BUILD_SHARED = $(subst @boost-link@,shared,\ - $(subst @boost-lib-suffix@,-mt,$($(PKG)_BUILD))) |