summaryrefslogtreecommitdiff
blob: 25b4475d78b04f4e212f517859d0b074119b0cd5 (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
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
diff -ru numptyphysics-9999.orig/external/Box2D/Source/Makefile numptyphysics-9999/external/Box2D/Source/Makefile
--- numptyphysics-9999.orig/external/Box2D/Source/Makefile	2015-11-25 22:27:36.155865064 -0500
+++ numptyphysics-9999/external/Box2D/Source/Makefile	2015-11-25 22:28:12.924578877 -0500
@@ -6,8 +6,6 @@
 TARGETS += Gen/nds-float/lib/libbox2d.a Gen/nds-fixed/lib/libbox2d.a
 endif
 
-CXXFLAGS=	-g -O2
-
 SOURCES = \
 	./Dynamics/b2Body.cpp \
 	./Dynamics/b2Island.cpp \
diff -ru numptyphysics-9999.orig/external/glaserl/makefile numptyphysics-9999/external/glaserl/makefile
--- numptyphysics-9999.orig/external/glaserl/makefile	2015-11-25 22:27:36.156865029 -0500
+++ numptyphysics-9999/external/glaserl/makefile	2015-11-25 22:28:12.924578877 -0500
@@ -1,7 +1,5 @@
 TARGET := libglaserl.a
 
-CFLAGS += -g -O2
-
 SOURCES := $(wildcard *.c)
 OBJECTS := $(SOURCES:.c=.o)
 
diff -ru numptyphysics-9999.orig/makefile numptyphysics-9999/makefile
--- numptyphysics-9999.orig/makefile	2015-11-25 22:27:36.167864644 -0500
+++ numptyphysics-9999/makefile	2015-11-25 22:28:12.925578842 -0500
@@ -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 @@
 
 $(TARGET): $(OBJECTS) $(LOCAL_LIBS)
 	$(SILENTMSG) "\tLD\t$@"
-	$(SILENTCMD) $(CXX) -o $@ $^ $(LIBS)
+	$(SILENTCMD) $(CXX) -o $@ $^ $(LDFLAGS) $(LIBS)
 
 clean: $(ADDITIONAL_CLEAN_TARGETS)
 	$(SILENTMSG) "\tCLEAN"
diff -ru numptyphysics-9999.orig/mk/silent.mk numptyphysics-9999/mk/silent.mk
--- numptyphysics-9999.orig/mk/silent.mk	2015-11-25 22:27:36.168864609 -0500
+++ numptyphysics-9999/mk/silent.mk	2015-11-25 22:28:12.925578842 -0500
@@ -2,6 +2,6 @@
     SILENTMSG := @true
     SILENTCMD :=
 else
-    SILENTMSG := @echo
+    SILENTMSG := @echo -e
     SILENTCMD := @
 endif
diff -ru numptyphysics-9999.orig/platform/gl/gl.mk numptyphysics-9999/platform/gl/gl.mk
--- numptyphysics-9999.orig/platform/gl/gl.mk	2015-11-25 22:27:36.172864469 -0500
+++ numptyphysics-9999/platform/gl/gl.mk	2015-11-25 22:28:12.925578842 -0500
@@ -3,9 +3,9 @@
 LIBS += -framework OpenGL
 else
 ifneq ($(wildcard $(patsubst %,%/libGL.so.1,/usr/lib /usr/lib64 /usr/lib/*)),)
-add_pkgconfig(gl)
+$(eval $(call add_pkgconfig,gl))
 else
-add_pkgconfig(glesv2)
+$(eval $(call add_pkgconfig,glesv2))
 CFLAGS += -DUSE_OPENGL_ES
 CXXFLAGS += -DUSE_OPENGL_ES
 endif
diff -ru numptyphysics-9999.orig/src/Os.cpp numptyphysics-9999/src/Os.cpp
--- numptyphysics-9999.orig/src/Os.cpp	2015-11-25 22:27:36.183864084 -0500
+++ numptyphysics-9999/src/Os.cpp	2015-11-25 22:29:17.177331313 -0500
@@ -262,5 +262,5 @@
     }
 
     // System-wide installation
-    return thp::format("%s/../share/%s/data", g_appDir.c_str(), appName().c_str());
+    return "@GENTOO_DATADIR@";
 }