Commit 34b32ba6 authored by Tobias WEBER's avatar Tobias WEBER

makefile update

parent 68620490
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
# system-specific build flags # system-specific build flags
# which compiler? # which compiler?
#CC = gcc CC = g++
CC = clang #CC = clang++
# debug or unstable version? # debug or unstable version?
DO_DEBUG = 0 DO_DEBUG = 0
...@@ -31,7 +31,7 @@ USE_LAPACK = 0 ...@@ -31,7 +31,7 @@ USE_LAPACK = 0
# compile the ogl code? # compile the ogl code?
USE_3D = 1 USE_3D = 1
REINIT_3D_HACK = 1 REINIT_3D_HACK = 0
# compile the network code? # compile the network code?
USE_NET = 1 USE_NET = 1
...@@ -99,9 +99,7 @@ else ...@@ -99,9 +99,7 @@ else
MT_LIBS = -lpthread -lgomp -lrt MT_LIBS = -lpthread -lgomp -lrt
endif endif
STD_LIBS = -lstdc++ STD_LIBS =
#STD_LIBS = -lc++ -lc++abi
STD_LIBS += -lm
ifeq ($(USE_FRAMEWORKS), 0) ifeq ($(USE_FRAMEWORKS), 0)
STD_LIBS += $(MT_LIBS) STD_LIBS += $(MT_LIBS)
endif endif
...@@ -358,7 +356,7 @@ endif ...@@ -358,7 +356,7 @@ endif
ifeq ($(USE_PY), 1) ifeq ($(USE_PY), 1)
#PY_LIBS = -lboost_python${PY_BOOSTLIB_VER}${BOOST_SUFFIX} #PY_LIBS = -lboost_python${PY_BOOSTLIB_VER}${BOOST_SUFFIX}
#PY_LIBS = -lboost_python36${BOOST_SUFFIX} #PY_LIBS = -lboost_python36${BOOST_SUFFIX}
PY_LIBS = -lboost_python${BOOST_SUFFIX} PY_LIBS = -lboost_python3${BOOST_SUFFIX}
ifeq ($(USE_FRAMEWORKS), 0) ifeq ($(USE_FRAMEWORKS), 0)
PY_LIBS += -lpython${PY_LIB_VER} PY_LIBS += -lpython${PY_LIB_VER}
......
...@@ -312,7 +312,7 @@ int main(int argc, char** argv) ...@@ -312,7 +312,7 @@ int main(int argc, char** argv)
if(bStartTakinMain) if(bStartTakinMain)
{ {
QPixmap pixSplash = load_pixmap("res/icons/takin.svg"); QPixmap pixSplash = load_pixmap("res/icons/takin.svg");
if(!pixSplash.isNull()) if(!pixSplash.isNull())
pixSplash = pixSplash.scaled(pixSplash.size().width()*0.55, pixSplash.size().height()*0.55); pixSplash = pixSplash.scaled(pixSplash.size().width()*0.55, pixSplash.size().height()*0.55);
pSplash.reset(new QSplashScreen{pixSplash}); pSplash.reset(new QSplashScreen{pixSplash});
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment