Browse Source

Win9x: Fix MinSizeRel and binary stripping

pull/6646/merge
Gleb Mazovetskiy 3 years ago
parent
commit
48a66c29af
  1. 4
      CMake/platforms/mingw9x.toolchain.cmake
  2. 1
      CMake/platforms/mingwcc.toolchain.cmake
  3. 1
      CMake/platforms/mingwcc64.toolchain.cmake
  4. 3
      CMakeLists.txt

4
CMake/platforms/mingw9x.toolchain.cmake

@ -10,9 +10,13 @@ list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES "${CROSS_PREFIX}/i686-w64-min
list(PREPEND CMAKE_C_STANDARD_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_LIST_DIR}/mingw9x/include")
list(PREPEND CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_LIST_DIR}/mingw9x/include")
# work around https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106103
set(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "${CMAKE_CXX_FLAGS_MINSIZEREL_INIT} -fno-declone-ctor-dtor")
SET(CMAKE_C_COMPILER "i686-w64-mingw32-gcc")
SET(CMAKE_CXX_COMPILER "i686-w64-mingw32-g++")
set(CMAKE_RC_COMPILER "i686-w64-mingw32-windres")
set(CMAKE_STRIP "${CROSS_PREFIX}/i686-w64-mingw32/bin/strip")
set(PKG_CONFIG_EXECUTABLE "${CROSS_PREFIX}/bin/i686-w64-mingw32-pkg-config" CACHE STRING "Path to pkg-config")
SET(CMAKE_FIND_ROOT_PATH "${CROSS_PREFIX}/i686-w64-mingw32" "${CROSS_PREFIX}/i686-w64-mingw32/i686-w64-mingw32")

1
CMake/platforms/mingwcc.toolchain.cmake

@ -10,6 +10,7 @@ list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES "${CROSS_PREFIX}/i686-w64-min
SET(CMAKE_C_COMPILER "i686-w64-mingw32-gcc")
SET(CMAKE_CXX_COMPILER "i686-w64-mingw32-g++")
set(CMAKE_RC_COMPILER "i686-w64-mingw32-windres")
set(CMAKE_STRIP "${CROSS_PREFIX}/i686-w64-mingw32/bin/strip")
set(PKG_CONFIG_EXECUTABLE "${CROSS_PREFIX}/bin/i686-w64-mingw32-pkg-config" CACHE STRING "Path to pkg-config")
SET(CMAKE_FIND_ROOT_PATH "${CROSS_PREFIX}/i686-w64-mingw32" "${CROSS_PREFIX}/i686-w64-mingw32/i686-w64-mingw32")

1
CMake/platforms/mingwcc64.toolchain.cmake

@ -10,6 +10,7 @@ list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES "${CROSS_PREFIX}/x86_64-w64-m
SET(CMAKE_C_COMPILER "x86_64-w64-mingw32-gcc")
SET(CMAKE_CXX_COMPILER "x86_64-w64-mingw32-g++")
set(CMAKE_RC_COMPILER "x86_64-w64-mingw32-windres")
set(CMAKE_STRIP "${CROSS_PREFIX}/x86_64-w64-mingw32/bin/strip")
set(PKG_CONFIG_EXECUTABLE "${CROSS_PREFIX}/bin/x86_64-w64-mingw32-pkg-config" CACHE STRING "Path to pkg-config")
SET(CMAKE_FIND_ROOT_PATH "${CROSS_PREFIX}/x86_64-w64-mingw32" "${CROSS_PREFIX}/x86_64-w64-mingw32/x86_64-w64-mingw32")

3
CMakeLists.txt

@ -335,8 +335,7 @@ else()
add_custom_command(
TARGET ${BIN_TARGET} POST_BUILD
DEPENDS ${BIN_TARGET}
COMMAND $<$<CONFIG:Release>:${CMAKE_STRIP}>
$<$<CONFIG:MinSizeRel>:${CMAKE_STRIP}>
COMMAND $<$<OR:$<CONFIG:Release>,$<CONFIG:MinSizeRel>>:${CMAKE_STRIP}>
ARGS $<TARGET_FILE:${BIN_TARGET}>)
endif()
endif()

Loading…
Cancel
Save