mirror of https://github.com/oxen-io/lokinet
make windows fixes
parent
b8eb9cdb2e
commit
6e5cab971f
@ -1,28 +1,16 @@
|
|||||||
set(CMAKE_SYSTEM_NAME Windows)
|
set(CMAKE_SYSTEM_NAME Windows)
|
||||||
set(TOOLCHAIN_PREFIX x86_64-w64-mingw32)
|
set(TOOLCHAIN_PREFIX x86_64-w64-mingw32)
|
||||||
set(TOOLCHAIN_SUFFIX "")
|
set(TOOLCHAIN_SUFFIX "")
|
||||||
|
set(WIN64_CROSS_COMPILE ON)
|
||||||
|
|
||||||
add_definitions("-DWINNT_CROSS_COMPILE")
|
set(TOOLCHAIN_PATHS
|
||||||
|
/usr/${TOOLCHAIN_PREFIX}
|
||||||
# target environment on the build host system
|
/usr/local/opt/mingw-w64/toolchain-x86_64
|
||||||
# second one is for non-root installs
|
/usr/local/opt/mingw-w64/toolchain-x86_64/x86_64-w64-mingw32
|
||||||
set(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX} /usr/local/opt/mingw-w64/toolchain-x86_64/ /opt/mingw64 /home/$ENV{USER}/mingw32 /home/$ENV{USER}/mingw64 /home/$ENV{USER}/mingw64/${TOOLCHAIN_PREFIX} /home/$ENV{USER}/mingw32/${TOOLCHAIN_PREFIX})
|
/opt/mingw64
|
||||||
|
/home/$ENV{USER}/mingw32
|
||||||
# modify default behavior of FIND_XXX() commands
|
/home/$ENV{USER}/mingw64
|
||||||
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
|
/home/$ENV{USER}/mingw64/${TOOLCHAIN_PREFIX}
|
||||||
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
|
/home/$ENV{USER}/mingw32/${TOOLCHAIN_PREFIX})
|
||||||
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
|
|
||||||
|
|
||||||
# cross compilers to use
|
|
||||||
if($ENV{COMPILER} MATCHES "clang")
|
|
||||||
set(USING_CLANG ON)
|
|
||||||
set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-clang)
|
|
||||||
set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-clang++)
|
|
||||||
else()
|
|
||||||
set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc${TOOLCHAIN_SUFFIX})
|
|
||||||
set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++${TOOLCHAIN_SUFFIX})
|
|
||||||
add_compile_options("-Wa,-mbig-obj")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres)
|
include("${CMAKE_CURRENT_LIST_DIR}/mingw_core.cmake")
|
||||||
set(WIN64_CROSS_COMPILE ON)
|
|
||||||
|
@ -1,26 +1,15 @@
|
|||||||
set(CMAKE_SYSTEM_NAME Windows)
|
set(CMAKE_SYSTEM_NAME Windows)
|
||||||
set(TOOLCHAIN_PREFIX i686-w64-mingw32)
|
set(TOOLCHAIN_PREFIX i686-w64-mingw32)
|
||||||
|
set(TOOLCHAIN_SUFFIX "")
|
||||||
|
set(WOW64_CROSS_COMPILE ON)
|
||||||
|
|
||||||
add_definitions("-DWINNT_CROSS_COMPILE")
|
set(TOOLCHAIN_PATHS
|
||||||
|
/usr/${TOOLCHAIN_PREFIX}
|
||||||
# target environment on the build host system
|
/usr/local/opt/mingw-w64/toolchain-i686
|
||||||
# second one is for non-root installs
|
/usr/local/opt/mingw-w64/toolchain-i686/i686-w64-mingw32
|
||||||
set(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX} /opt/mingw32 /home/$ENV{USER}/mingw32 /home/$ENV{USER}/mingw32/${TOOLCHAIN_PREFIX})
|
/opt/mingw32
|
||||||
|
/home/$ENV{USER}/mingw32
|
||||||
# modify default behavior of FIND_XXX() commands
|
/home/$ENV{USER}/mingw32/${TOOLCHAIN_PREFIX}
|
||||||
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
|
)
|
||||||
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
|
|
||||||
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
|
|
||||||
|
|
||||||
# cross compilers to use
|
|
||||||
if($ENV{COMPILER} MATCHES "clang")
|
|
||||||
set(USING_CLANG ON)
|
|
||||||
set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-clang)
|
|
||||||
set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-clang++)
|
|
||||||
else()
|
|
||||||
set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc)
|
|
||||||
set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres)
|
include("${CMAKE_CURRENT_LIST_DIR}/mingw_core.cmake")
|
||||||
set(WOW64_CROSS_COMPILE ON)
|
|
||||||
|
@ -0,0 +1,24 @@
|
|||||||
|
# target environment on the build host system
|
||||||
|
# second one is for non-root installs
|
||||||
|
set(CMAKE_FIND_ROOT_PATH ${TOOLCHAIN_PATHS})
|
||||||
|
|
||||||
|
add_definitions("-DWINNT_CROSS_COMPILE")
|
||||||
|
|
||||||
|
# modify default behavior of FIND_XXX() commands
|
||||||
|
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
|
||||||
|
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
|
||||||
|
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
|
||||||
|
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
|
||||||
|
|
||||||
|
# cross compilers to use
|
||||||
|
if($ENV{COMPILER} MATCHES "clang")
|
||||||
|
set(USING_CLANG ON)
|
||||||
|
set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-clang)
|
||||||
|
set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-clang++)
|
||||||
|
else()
|
||||||
|
set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc${TOOLCHAIN_SUFFIX})
|
||||||
|
set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++${TOOLCHAIN_SUFFIX})
|
||||||
|
add_compile_options("-Wa,-mbig-obj")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres)
|
Loading…
Reference in New Issue