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
|
From b34239b04545884b65c910e9782e770ceafc8f40 Mon Sep 17 00:00:00 2001
From: Daigo Moriwaki <daigo@debian.org>
Date: Sun, 4 Dec 2016 22:30:29 +0900
Subject: Customize make files
---
Makefile | 2 +-
makefile.conf | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index ee48d19..be9c825 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ viewer: update-revision gui-lib
cd sample/viewer; env $(QMAKEENV) $(QMAKEPATH)qmake $(QMAKEARG)
cd sample/viewer; env $(QMAKEENV) $(MAKE)
-viewer-release: update-revision gui-lib
+viewer-release: gui-lib
-rm sample/viewer/viewer
cd sample/viewer; env $(QMAKEENV) $(QMAKEPATH)qmake $(QMAKEARG) OSL_LIB=release
cd sample/viewer; env $(QMAKEENV) $(MAKE)
diff --git a/makefile.conf b/makefile.conf
index 8768298..657e261 100644
--- a/makefile.conf
+++ b/makefile.conf
@@ -1,13 +1,12 @@
-OSL_HOME = $(GPSSHOGI_HOME)/../osl
+#OSL_HOME = $(GPSSHOGI_HOME)/../osl
-include $(GPSSHOGI_HOME)/makefile.local
-include $(OSL_HOME)/makefile.local
USE_GCH = 0
include $(OSL_HOME)/makefile.conf
GPSSHOGI_REVISION_H = $(GPSSHOGI_HOME)/include/gpsshogi/revision.h
-LDFLAGS += -L$(OSL_HOME)/full/osl -L$(OSL_HOME)/std/osl -L$(OSL_HOME)/core/osl
-LOADLIBES += -losl_full -losl_std -losl_core $(BOOST_LIBS) -lboost_program_options $(LDLIBS) $(PTHREAD_LIBS)
-INCLUDES += -I$(GPSSHOGI_HOME)/include -I$(OSL_HOME)/full -I$(OSL_HOME)/std -I$(OSL_HOME)/core
+LOADLIBES += -losl $(BOOST_LIBS) -lboost_program_options $(LDLIBS) $(PTHREAD_LIBS)
+INCLUDES += -I$(GPSSHOGI_HOME)/include
ifdef CXX_HOME
QMAKEPATH ?= $(CXX_HOME)/bin/
--
2.20.1
|
