1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48
|
From 60620572dcfca3082e54fe4b118b627fff9d637a Mon Sep 17 00:00:00 2001
From: Daigo Moriwaki <daigo@debian.org>
Date: Sun, 4 Dec 2016 15:03:14 +0900
Subject: [PATCH 03/11] Customize makefile.conf
---
makefile.conf | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/makefile.conf b/makefile.conf
index ed43a2404..f773de8e4 100644
--- a/makefile.conf
+++ b/makefile.conf
@@ -1,22 +1,22 @@
-CXX = c++ -std=c++11 -DOSL_SMP
-GXX = c++ -std=c++11 -DOSL_SMP
+CXX = g++ -DOSL_SMP
+GXX = g++ -DOSL_SMP
ARC ?= ar cru
RANLIB ?= ranlib
INCLUDES = -I..
-CPUOPTION ?= -march=native
+CPUOPTION ?=
RELEASE_CXX_OPTFLAGS = -O3 -DNDEBUG $(CPUOPTION) -g
ifneq ("$(strip $(DEBUG))","")
-CXXFLAGS = -O -g $(INCLUDES)
+CXXFLAGS += -O -g $(INCLUDES)
else
-CXXFLAGS = $(RELEASE_CXX_OPTFLAGS) $(INCLUDES)
+CXXFLAGS += $(RELEASE_CXX_OPTFLAGS) $(INCLUDES)
endif
CXX_CPP_FLAGS = $(INCLUDES)
-FILE_OSL_CORE = $(OSL_HOME)/core/osl/libosl_core.a
-FILE_OSL_STD = $(OSL_HOME)/std/osl/libosl_std.a
-FILE_OSL_FULL = $(OSL_HOME)/full/osl/libosl_full.a
-FILE_OSL_ALL = $(FILE_OSL_FULL) $(FILE_OSL_STD) $(FILE_OSL_CORE)
+FILE_OSL_CORE =
+FILE_OSL_STD =
+FILE_OSL_FULL =
+FILE_OSL_ALL =
PROFILE_USE = -fprofile-use -fprofile-correction
PROFILE_GENERATE = -fprofile-generate
--
2.33.0
|