diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2012-08-25 14:11:23 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2012-08-25 14:11:23 (GMT) |
| commit | 070e7a680dcf1feebb76b79cf83b58788cb2b94c (patch) | |
| tree | 54a30d1b71b0fffc71ad431bd0ecb2c3688ab104 /src/gcc.mk | |
| parent | 82fe6a17c9fbb6d432eb22848ad9dc12fa9ea435 (diff) | |
| download | mxe-070e7a680dcf1feebb76b79cf83b58788cb2b94c.zip mxe-070e7a680dcf1feebb76b79cf83b58788cb2b94c.tar.gz mxe-070e7a680dcf1feebb76b79cf83b58788cb2b94c.tar.bz2 | |
Revert "Move CMAKE_BUILD_TYPE, CMAKE_AR and CMAKE_RANLIB into toolchain file"
This reverts commit e57db6d8c9c7ecbe43dd1fdb3d17f07871dfc9fb.
See http://lists.nongnu.org/archive/html/mingw-cross-env-list/2012-08/msg00028.html
Diffstat (limited to 'src/gcc.mk')
| -rw-r--r-- | src/gcc.mk | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -59,10 +59,9 @@ define $(PKG)_BUILD # create the CMake toolchain file [ -d '$(dir $(CMAKE_TOOLCHAIN_FILE))' ] || mkdir -p '$(dir $(CMAKE_TOOLCHAIN_FILE))' - (echo 'set(CMAKE_SYSTEM_NAME Windows)'; \ + (echo 'set(BUILD_SHARED_LIBS OFF)'; \ + echo 'set(CMAKE_SYSTEM_NAME Windows)'; \ echo 'set(MSYS 1)'; \ - echo 'set(BUILD_SHARED_LIBS OFF)'; \ - echo 'set(CMAKE_BUILD_TYPE Release)'; \ echo 'set(CMAKE_FIND_ROOT_PATH $(PREFIX)/$(TARGET))'; \ echo 'set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)'; \ echo 'set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)'; \ @@ -71,8 +70,6 @@ define $(PKG)_BUILD echo 'set(CMAKE_CXX_COMPILER $(PREFIX)/bin/$(TARGET)-g++)'; \ echo 'set(CMAKE_Fortran_COMPILER $(PREFIX)/bin/$(TARGET)-gfortran)'; \ echo 'set(CMAKE_RC_COMPILER $(PREFIX)/bin/$(TARGET)-windres)'; \ - echo 'set(CMAKE_AR $(PREFIX)/bin/$(TARGET)-ar)'; \ - echo 'set(CMAKE_RANLIB $(PREFIX)/bin/$(TARGET)-ranlib)'; \ echo 'set(PKG_CONFIG_EXECUTABLE $(PREFIX)/bin/$(TARGET)-pkg-config)'; \ echo 'set(QT_QMAKE_EXECUTABLE $(PREFIX)/bin/$(TARGET)-qmake)'; \ echo 'set(CMAKE_INSTALL_PREFIX $(PREFIX)/$(TARGET) CACHE PATH "Installation Prefix")'; \ |