blob: e1276a86eddc6f18be473ec6514f563d7a5dd7cb (
plain)
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
|
diff --git a/external/glaserl/makefile b/external/glaserl/makefile
index 4120459..f49d9e7 100644
--- a/external/glaserl/makefile
+++ b/external/glaserl/makefile
@@ -1,7 +1,5 @@
TARGET := libglaserl.a
-CFLAGS += -g -O2
-
SOURCES := $(wildcard *.c)
OBJECTS := $(SOURCES:.c=.o)
diff --git a/makefile b/makefile
index 0f9a9b6..292b759 100644
--- a/makefile
+++ b/makefile
@@ -1,7 +1,6 @@
APP := numptyphysics
SOURCES := $(wildcard src/*.cpp)
-CXXFLAGS += -std=c++11 -Isrc -Wall -Wno-sign-compare
all: app
@@ -13,7 +12,7 @@ app: $(TARGET)
$(TARGET): $(OBJECTS) $(LOCAL_LIBS)
$(SILENTMSG) "\tLD\t$@\n"
- $(SILENTCMD) $(CXX) -o $@ $^ $(LIBS)
+ $(SILENTCMD) $(CXX) -o $@ $^ $(LDFLAGS) $(LIBS)
clean: $(ADDITIONAL_CLEAN_TARGETS)
$(SILENTMSG) "\tCLEAN\n"
diff --git a/src/Os.cpp b/src/Os.cpp
index b5d7fb9..6a0ccf4 100644
--- a/src/Os.cpp
+++ b/src/Os.cpp
@@ -262,5 +262,5 @@ Os::globalDataDir()
}
// System-wide installation
- return thp::format("%s/../share/%s/data", g_appDir.c_str(), appName().c_str());
+ return "@GENTOO_DATADIR@";
}
|
GitWeb
