projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: Start filling in details about Altos Droid flight monitoring
[fw/altos]
/
altosui
/
Makefile-standalone
diff --git
a/altosui/Makefile-standalone
b/altosui/Makefile-standalone
index a95a5aa889952dcfae12ccddf98f4c563f790651..23163e40278dbb63f68333d3df861cfc8c0b46f6 100644
(file)
--- a/
altosui/Makefile-standalone
+++ b/
altosui/Makefile-standalone
@@
-44,8
+44,15
@@
CLASSFILES=\
AltosRomconfigUI.class \
AltosVoice.class
AltosRomconfigUI.class \
AltosVoice.class
-JAVA_ICON=../../icon/altus-metrum-16x16.jpg
-WINDOWS_ICON=../../icon/altus-metrum.ico
+JAVA_ICONS=\
+ ../icon/altus-metrum-16.png \
+ ../icon/altus-metrum-32.png \
+ ../icon/altus-metrum-48.png \
+ ../icon/altus-metrum-64.png \
+ ../icon/altus-metrum-128.png \
+ ../icon/altus-metrum-256.png
+
+WINDOWS_ICON=../icon/altus-metrum.ico
# where altosui.jar gets installed
ALTOSLIB=/usr/share/java
# where altosui.jar gets installed
ALTOSLIB=/usr/share/java
@@
-64,7
+71,7
@@
FREETTSJAR= \
$(FREETTSLIB)/freetts.jar
# The current hex files
$(FREETTSLIB)/freetts.jar
# The current hex files
-HEXLIB=../
../
src
+HEXLIB=../src
HEXFILES = \
$(HEXLIB)/telemetrum-v1.0.ihx \
$(HEXLIB)/teledongle-v0.2.ihx
HEXFILES = \
$(HEXLIB)/telemetrum-v1.0.ihx \
$(HEXLIB)/teledongle-v0.2.ihx
@@
-105,11
+112,11
@@
classes/altosui:
classes/libaltosJNI:
mkdir -p classes
classes/libaltosJNI:
mkdir -p classes
- ln -sf ../
../
libaltos/libaltosJNI classes/libaltosJNI
+ ln -sf ../libaltos/libaltosJNI classes/libaltosJNI
classes/images:
mkdir -p classes/images
classes/images:
mkdir -p classes/images
- ln -sf ../
../$(JAVA_ICON
) classes/images
+ ln -sf ../
$(JAVA_ICONS
) classes/images
altosui:
echo "#!/bin/sh" > $@
altosui:
echo "#!/bin/sh" > $@
@@
-123,12
+130,12
@@
fat/altosui:
echo 'exec java -Djava.library.path="$$DIR" -jar "$$DIR"/altosui.jar' >> $@
chmod +x $@
echo 'exec java -Djava.library.path="$$DIR" -jar "$$DIR"/altosui.jar' >> $@
chmod +x $@
-fat/altosui.jar: $(CLASSFILES) $(JAVA_ICON) fat/classes/Manifest.txt
+fat/altosui.jar: $(CLASSFILES) $(JAVA_ICON
S
) fat/classes/Manifest.txt
mkdir -p fat/classes
test -L fat/classes/altosui || ln -sf ../.. fat/classes/altosui
mkdir -p fat/classes/images
mkdir -p fat/classes
test -L fat/classes/altosui || ln -sf ../.. fat/classes/altosui
mkdir -p fat/classes/images
- cp $(JAVA_ICON) fat/classes/images
- test -L fat/classes/libaltosJNI || ln -sf ../../
../
libaltos/libaltosJNI fat/classes/libaltosJNI
+ cp $(JAVA_ICON
S
) fat/classes/images
+ test -L fat/classes/libaltosJNI || ln -sf ../../libaltos/libaltosJNI fat/classes/libaltosJNI
cd ./fat/classes && jar cfm ../../$@ Manifest.txt images/* altosui/*.class libaltosJNI/*.class
fat/classes/Manifest.txt: $(CLASSFILES) Makefile
cd ./fat/classes && jar cfm ../../$@ Manifest.txt images/* altosui/*.class libaltosJNI/*.class
fat/classes/Manifest.txt: $(CLASSFILES) Makefile
@@
-153,7
+160,7
@@
distclean: clean
FAT_FILES=$(FATJAR) $(FREETTSJAR) $(HEXFILES)
FAT_FILES=$(FATJAR) $(FREETTSJAR) $(HEXFILES)
-LINUX_FILES=$(FAT_FILES)
../
libaltos/libaltos.so fat/altosui
+LINUX_FILES=$(FAT_FILES) libaltos/libaltos.so fat/altosui
$(LINUX_TGZ): $(LINUX_FILES)
rm -f $@
mkdir -p linux/AltOS
$(LINUX_TGZ): $(LINUX_FILES)
rm -f $@
mkdir -p linux/AltOS
@@
-161,7
+168,7
@@
$(LINUX_TGZ): $(LINUX_FILES)
cp $(LINUX_FILES) linux/AltOS
cd linux && tar czf ../$@ AltOS
cp $(LINUX_FILES) linux/AltOS
cd linux && tar czf ../$@ AltOS
-DARWIN_RESOURCES=$(FATJAR) $(FREETTSJAR)
../
libaltos/libaltos.dylib
+DARWIN_RESOURCES=$(FATJAR) $(FREETTSJAR) libaltos/libaltos.dylib
DARWIN_EXTRA=$(HEXFILES)
DARWIN_FILES=$(DARWIN_RESOURCES) $(DARWIN_EXTRA)
DARWIN_EXTRA=$(HEXFILES)
DARWIN_FILES=$(DARWIN_RESOURCES) $(DARWIN_EXTRA)
@@
-174,7
+181,7
@@
$(DARWIN_ZIP): $(DARWIN_FILES)
cp $(DARWIN_EXTRA) darwin/AltOS
cd darwin && zip -r ../$@ AltosUI.app AltOS
cp $(DARWIN_EXTRA) darwin/AltOS
cd darwin && zip -r ../$@ AltosUI.app AltOS
-WINDOWS_FILES = $(FAT_FILES)
../libaltos/altos.dll ../
../telemetrum.inf $(WINDOWS_ICON)
+WINDOWS_FILES = $(FAT_FILES)
libaltos/altos.dll
../telemetrum.inf $(WINDOWS_ICON)
$(WINDOWS_EXE): $(WINDOWS_FILES) altos-windows.nsi
rm -f $@
$(WINDOWS_EXE): $(WINDOWS_FILES) altos-windows.nsi
rm -f $@