Skip to content

Commit

Permalink
Simplified makefile, silenced some warnings from alglib
Browse files Browse the repository at this point in the history
  • Loading branch information
sirzooro committed Jan 13, 2019
1 parent cd1a7e7 commit 0810bed
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 18 deletions.
24 changes: 6 additions & 18 deletions boinc_app/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,37 +22,29 @@ CPPFLAGS = -O3 \
ifeq ($(MinGW32),1)
$(info ===== Compiling MinGW 32-bit app version =====)
CPP = i686-w64-mingw32-g++
else
ifeq ($(MinGW64),1)
else ifeq ($(MinGW64),1)
$(info ===== Compiling MinGW 64-bit app version =====)
CPP = x86_64-w64-mingw32-g++
else
ifeq ($(M32),1)
else ifeq ($(M32),1)
$(info ===== Compiling 32-bit app version =====)
CPP = g++ -m32
else
CPP = g++
endif
endif
endif

ifeq ($(SSE2),1)
$(info ===== Compiling SSE2 app version =====)
CPPFLAGS += -msse2
else
ifeq ($(SSE41),1)
else ifeq ($(SSE41),1)
$(info ===== Compiling SSE4.1 app version =====)
CPPFLAGS += -msse4.1
else
ifeq ($(AVX),1)
else ifeq ($(AVX),1)
$(info ===== Compiling AVX app version =====)
CPPFLAGS += -mavx -mtune=sandybridge
else
ifeq ($(AVX2),1)
else ifeq ($(AVX2),1)
$(info ===== Compiling AVX2 app version =====)
CPPFLAGS += -mavx2 -mfma -mtune=haswell
else
ifeq ($(AVX512),1)
else ifeq ($(AVX512),1)
$(info ===== Compiling AVX512 app version =====)
CPPFLAGS += -march=skylake-avx512
ifeq ($(MinGW64),1)
Expand All @@ -63,10 +55,6 @@ CPPFLAGS += \
-ffixed-xmm24 -ffixed-xmm25 -ffixed-xmm26 -ffixed-xmm27 -ffixed-xmm28 -ffixed-xmm29 -ffixed-xmm30 -ffixed-xmm31
endif
endif
endif
endif
endif
endif

ifeq ($(NOWARN),1)
CPPFLAGS += -w
Expand Down
7 changes: 7 additions & 0 deletions boinc_app/all.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"

#include <ap.cpp>
#include <alglibinternal.cpp>
#include <specialfunctions.cpp>
#include <alglibmisc.cpp>
#include <linalg.cpp>

#pragma GCC diagnostic pop

#include <sequential.cpp>

0 comments on commit 0810bed

Please sign in to comment.