From: Thomas Debesse Date: Sat, 20 Mar 2021 14:19:50 +0000 (+0100) Subject: cmake/gtkglext: do not override CC X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=39aff767d94b6d5eb3e855d8da247e77b36a1859;p=xonotic%2Fnetradiant.git cmake/gtkglext: do not override CC This bring many issues we don't have man power for at this time. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a044031..7d743f70 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -395,14 +395,12 @@ if (BUILTIN_GTKGLEXT) GIT_REPOSITORY https://gitlab.gnome.org/illwieckz/gtkglext.git GIT_TAG ${GTKGLEXT_GIT_TAG} BUILD_IN_SOURCE ON - CONFIGURE_COMMAND export CC=${CMAKE_C_COMPILER} - CONFIGURE_COMMAND && export CFLAGS=${GTKGLEXT_LDFLAGS} + CONFIGURE_COMMAND export CFLAGS=${GTKGLEXT_LDFLAGS} CONFIGURE_COMMAND && export LDFLAGS=${GTKGLEXT_CFLAGS} CONFIGURE_COMMAND && export NOCONFIGURE=1 CONFIGURE_COMMAND && ./autogen.sh CONFIGURE_COMMAND && ./configure --prefix "${BUILTINS_INSTALL_DIR}" ${CONFIGURE_OPTIONS} BUILD_COMMAND $(MAKE) - BUILD_COMMAND CC=${CMAKE_C_COMPILER} BUILD_COMMAND CFLAGS=${GTKGLEXT_CFLAGS} BUILD_COMMAND LDFLAGS=${GTKGLEXT_LDFLAGS} INSTALL_COMMAND $(MAKE) install