From 5bc180a583c8fdbf2eaadbf6a5ab294e348db498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Thu, 22 Oct 2015 23:59:10 +0200 Subject: [PATCH] Fixes for travis builds of new AT&T syntax --- CMakeLists_mingw.txt | 4 ++-- install.sh | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists_mingw.txt b/CMakeLists_mingw.txt index 4be930b8e4..d4817994d1 100644 --- a/CMakeLists_mingw.txt +++ b/CMakeLists_mingw.txt @@ -11,8 +11,8 @@ SET(PKG_CONFIG_EXECUTABLE ${COMPILER_PREFIX}-pkg-config) # potential flags to make code more similar to MSVC: # -fshort-wchar -fshort-enums -mms-bitfields # -set(CMAKE_C_FLAGS "-masm=intel -std=gnu99 -fpack-struct=1" CACHE STRING "" FORCE) -set(CMAKE_CXX_FLAGS "-masm=intel -std=c++0x -std=gnu++0x -fpack-struct=1" CACHE STRING "" FORCE) +set(CMAKE_C_FLAGS "-std=gnu99 -fpack-struct=1" CACHE STRING "" FORCE) +set(CMAKE_CXX_FLAGS "-std=c++0x -std=gnu++0x -fpack-struct=1" CACHE STRING "" FORCE) if(${ACTUAL_SYSTEM} MATCHES "Linux") set(CMAKE_SHARED_LINKER_FLAGS "-O3 -static-libgcc -static-libstdc++ -static -lpthread" CACHE STRING "" FORCE) else() diff --git a/install.sh b/install.sh index 31acc48c72..eb19e49d5e 100755 --- a/install.sh +++ b/install.sh @@ -180,8 +180,6 @@ elif [[ `uname` == "Linux" ]]; then sudo dpkg -i libjansson4_2.7-1ubuntu1_i386.deb sudo dpkg -i libjansson-dev_2.7-1ubuntu1_i386.deb sudo apt-get install -f - export CC=gcc-4.8 - export CXX=g++-4.8 ;; "windows") sudo apt-get update