From ef7df8048d1067d3148287f27af9047743f1e2ae Mon Sep 17 00:00:00 2001 From: gcontini <1121667+gcontini@users.noreply.github.com> Date: 周日, 15 3月 2020 16:26:21 +0800 Subject: [PATCH] Merge branch 'feature/pc_identifiers' into develop issues #2 #3 #14 #49 --- cmake/toolchain-ubuntu-mingw64.cmake | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/cmake/toolchain-ubuntu-mingw64.cmake b/cmake/toolchain-ubuntu-mingw64.cmake index ebac7f8..e257856 100644 --- a/cmake/toolchain-ubuntu-mingw64.cmake +++ b/cmake/toolchain-ubuntu-mingw64.cmake @@ -13,11 +13,15 @@ set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc) set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++) set(CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres) +set(CMAKE_CXX_LINK_EXECUTABLE ${TOOLCHAIN_PREFIX}-g++) # target environment on the build host system # set 1st to dir with the cross compiler's C/C++ headers/libs set(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX}) +#if(CMAKE_CROSSCOMPILING) #cross compiling for linux... a crazy bug on my system +# link_directories(BEFORE /usr/lib/gcc/x86_64-w64-mingw32/7.3-win32) +#endif(CMAKE_CROSSCOMPILING) # modify default behavior of FIND_XXX() commands to # search for headers/libs in the target environment and # search for programs in the build host environment -- Gitblit v1.9.1