diff --git a/3rdparty/windows b/3rdparty/windows index 3b929f32..0200d6f7 160000 --- a/3rdparty/windows +++ b/3rdparty/windows @@ -1 +1 @@ -Subproject commit 3b929f321470457fefed2e3c38b118d73ad6822d +Subproject commit 0200d6f7e3b076809c8249711dc471d529b3e347 diff --git a/README b/README index 4648d582..27d29870 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Freq source code +# Freq source code /===================\ |Scalograms are cool| \===================/ diff --git a/appveyor.yml b/appveyor.yml index 88bb0766..f560d19b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,10 +1,16 @@ install: - - set QTDIR=C:\Qt\5.5\msvc2013_64 -# - set QTDIR=C:\Qt\5.5\mingw492_32 +# - set QTDIR=C:\Qt\5.5\msvc2013_64 + - set QTDIR=C:\Qt\5.5\mingw492_32 - set PATH=%PATH%;%QTDIR%\bin + - set PATH=%PATH%;C:\Qt\Tools\mingw492_32\bin # - set PATH=%PATH%;C:\MinGW\bin -# - set PATH=%PATH%;C:\Qt\Tools\mingw492_32 + - set QMAKEFEATURES=C:\projects\freq\features + - git submodule init + - git submodule update --depth 1 3rdparty\windows + - dir /s /b /a:d C:\Qt\5.5 + - dir /s /b /a:d C:\MinGW + - echo %PATH% build_script: - cd quick - - qmake -r -# - mingw32-make + - qmake -r -Wall -spec win32-g++ + - mingw32-make diff --git a/circle.yml b/circle.yml index 76968c43..fac39b7f 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,13 @@ +machine: + environment: + CXX: g++-4.9 dependencies: pre: - - sudo apt-get -y -qq install libgles2-mesa-dev libegl1-mesa-drivers libgl1-mesa-dri mesa-common-dev libglu1-mesa-dev build-essential + - yes y | sudo add-apt-repository ppa:ubuntu-toolchain-r/test + - sudo apt-get purge $(dpkg -l | grep libqt | awk '{print $2}') + - sudo apt-get install netbase + - sudo apt-get install libqt5webkit5-dev qt5-default; true + - sudo apt-get install gcc-4.9 checkout: post: - git submodule init @@ -8,3 +15,6 @@ checkout: test: override: - echo "Hello Circle!" + - cd quick + - qmake -r + - make diff --git a/features/buildflags.prf b/features/buildflags.prf index dd9f04b5..e91e14dc 100644 --- a/features/buildflags.prf +++ b/features/buildflags.prf @@ -7,7 +7,6 @@ message("buildflags for $$_PRO_FILE_PWD_ with $$QMAKESPEC") CONFIG += legacy-opengl win32-msvc*:CONFIG += debug_and_release CONFIG += warn_on -!macx-ios*:CONFIG += openmp CONFIG(debug, debug|release): DEFINES += _DEBUG CONFIG(debug, debug|release): DEFINES += SHARED_STATE_NO_TIMEOUT # don't timeout locks when stepping in a debugger CONFIG(release, debug|release): DEFINES += SHARED_STATE_NO_TIMEOUT # use simple locks in release @@ -87,7 +86,7 @@ macx { } } -win32 { +win32-msvc* { DEFINES += _SCL_SECURE_NO_WARNINGS _CRT_SECURE_NO_WARNINGS CONFIG(debug, debug|release) { diff --git a/lib/justmisc/thread_pool.cpp b/lib/justmisc/thread_pool.cpp index b0941015..99c30239 100644 --- a/lib/justmisc/thread_pool.cpp +++ b/lib/justmisc/thread_pool.cpp @@ -37,7 +37,9 @@ thread_pool:: #ifdef __clang__ pthread_setname_np(ss.str ().c_str ()); #else +#ifndef __MINGW32__ pthread_setname_np(pthread_self(), ss.str ().c_str ()); +#endif #endif } #endif