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
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
|
--- Makefile.orig 2021-12-29 08:48:31 UTC
+++ Makefile
@@ -9,7 +9,7 @@ TARGET := $(PLATFORM)
CROSSC := 1
else
# Get the compiler's (GCC or Clang) target triplet and use that as platform.
-TARGET := $(shell g++ -dumpmachine)
+TARGET :=
$(info TARGET: $(TARGET))
endif
@@ -17,8 +17,8 @@ ifdef TOOLCHAIN
#include Makefile.$(TARGET)
include toolchain/$(TOOLCHAIN).mk
else
-GPP = g++
-GCC = gcc
+GPP = c++
+GCC = cc
STRIP = strip
MAKEDIR = mkdir -p
RM = rm
@@ -34,7 +34,7 @@ UMCH := $(shell uname -m)
TARGET_BIN := $(TARGET)/
# Include the file with the versioning information ('VERSION' variable).
-include version
+include version.mk
VERSIONINFO = -D__VERSION="\"$(VERSION)\""
OUTPUT = nymphcast_server
@@ -47,7 +47,7 @@ INCLUDE = -I . -I ffplay -I angelscript/angelscript/in
-I gui/core/nanosvg
ifdef CROSSC
INCLUDE += -I $(SYSROOT)/usr/include/SDL2 -I $(SYSROOT)/usr/include/freetype2
-else
+else
INCLUDE += `sdl2-config --cflags` \
`pkg-config --cflags freetype2`
endif
@@ -55,7 +55,7 @@ endif
LIB := -lnymphrpc -lPocoNet -lPocoNetSSL -lPocoUtil -lPocoFoundation -lPocoJSON -lPocoData \
-lPocoDataSQLite -lswscale -lavcodec -lavdevice -lavformat -lavutil -lpostproc \
-lswresample -lavfilter -lSDL2_image -Langelscript/angelscript/lib-$(TARGET) -langelscript \
- -lstdc++fs -lfreetype \
+ -lfreetype \
-lcurl -lvlc -lfreeimage \
-lnymphcast -lPocoNet -lPocoUtil -lPocoFoundation
ifdef CROSSC
@@ -76,7 +76,7 @@ ifdef OS
LDFLAGS += -lws2_32 -lopengl32 -lwinmm -lole32
OUTPUT := $(OUTPUT).exe
else
- LDFLAGS += -pthread -latomic -lGL -lasound
+ LDFLAGS += -pthread -lGL -lasound
endif
# Check which version of OpenGL or OpenGL ES to use.
@@ -157,10 +157,10 @@ makedir:
$(MAKEDIR) obj/$(TARGET_BIN)lcdapi/api
$(MAKEDIR) obj/$(TARGET_BIN)lcdapi/sensors
$(MAKEDIR) bin/$(TARGET)
-
+
angelscript:
- make -C angelscript/angelscript/projects/gnuc/ static
-
+ $(MAKE) -C angelscript/angelscript/projects/gnuc/ static
+
gui: $(GUI_OBJECTS)
obj/$(TARGET_BIN)%.o: %.cpp
@@ -168,7 +168,7 @@ obj/$(TARGET_BIN)%.o: %.cpp
obj/$(TARGET_BIN)%.o: %.c
$(GCC) -c -o $@ $< -g3 $(CFLAGS)
-
+
bin/$(TARGET_BIN)$(OUTPUT): angelscript $(OBJECTS) $(C_OBJECTS) $(GUI_OBJECTS)
$(GPP) -o $@ $(OBJECTS) $(GUI_OBJECTS) $(C_OBJECTS) $(LDFLAGS)
cp $@ $@.debug
@@ -178,15 +178,15 @@ clean: clean-objects clean-angelscript clean-gui
clean-objects:
$(RM) $(OBJECTS) $(C_OBJECTS)
-
+
clean-angelscript:
- make -C angelscript/angelscript/projects/gnuc/ clean
-
+ $(MAKE) -C angelscript/angelscript/projects/gnuc/ clean
+
clean-gui:
$(RM) $(GUI_OBJECTS)
-
+
.PHONY: all clean angelscript makedir gui
-
+
.PHONY: install
install:
install -d $(DESTDIR)$(PREFIX)/bin/ \
@@ -201,12 +201,12 @@ install:
.PHONY: install-systemd
install-systemd:
- #install -d $(DESTDIR)$(CONFDIR)/systemd/system/
+ #install -d $(DESTDIR)$(CONFDIR)/systemd/system/
sed ${SED_REPLACE} systemd/nymphcast.service > /etc/systemd/system/nymphcast.service
.PHONY: install-openrc
install-openrc:
- install -d $(DESTDIR)$(CONFDIR)/init.d/
+ install -d $(DESTDIR)$(CONFDIR)/init.d/
sed ${SED_REPLACE} openrc/nymphcast > $(DESTDIR)$(CONFDIR)/init.d/nymphcast
chmod 0755 $(DESTDIR)$(CONFDIR)/init.d/nymphcast
@@ -227,7 +227,7 @@ ar-rasp-full: bin/$(TARGET_BIN)$(OUTPUT)
cp -r wallpapers/ out/tmp/payload/usr/local/share/nymphcast/.
#tar -cvJf out/nymphcast_raspbian.xz -C out/tmp/ .
cd out/tmp && zip --symlinks -vr ../nymphcast_raspbian.zip . && cd -
-
+
ar-rasp-audio: bin/$(TARGET_BIN)$(OUTPUT)
rm -rf out/tmp
rm -f out/nymphcast_audio_raspbian.zip
|
