diff options
| -rw-r--r-- | libaltos/Makefile-standalone | 15 | ||||
| -rwxr-xr-x | libaltos/libaltos.dylib | bin | 41648 -> 41596 bytes | |||
| -rw-r--r-- | micropeak/FTDI.tar.gz | bin | 0 -> 251029 bytes | |||
| -rw-r--r-- | micropeak/Info.plist | 45 | ||||
| -rw-r--r-- | micropeak/Info.plist.in | 7 | ||||
| -rw-r--r-- | micropeak/Makefile.am | 4 | ||||
| -rw-r--r-- | micropeak/MicroPeak.app/Contents/Resources/AltosUIIcon.icns | bin | 129010 -> 0 bytes | |||
| -rw-r--r-- | micropeak/MicroPeak.app/Contents/Resources/MicroPeak.icns | bin | 0 -> 133711 bytes |
8 files changed, 22 insertions, 49 deletions
diff --git a/libaltos/Makefile-standalone b/libaltos/Makefile-standalone index 4e438050..a1f9f5bc 100644 --- a/libaltos/Makefile-standalone +++ b/libaltos/Makefile-standalone @@ -22,9 +22,20 @@ endif # ifeq ($(OS),Darwin) +#OS_LIB_CFLAGS=\ +# -DDARWIN -DPOSIX_TTY -arch i386 -arch x86_64 \ +# --sysroot=/Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 \ +# -iwithsysroot /System/Library/Frameworks/JavaVM.framework/Headers \ +# -iwithsysroot /System/Library/Frameworks/IOKit.framework/Headers \ +# -iwithsysroot /System/Library/Frameworks/CoreFoundation.framework/Headers + +XCODE=/Applications/Xcode.app +SDK=$(XCODE)/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk +MINVERSION=10.5 + OS_LIB_CFLAGS=\ - -DDARWIN -DPOSIX_TTY -arch i386 -arch x86_64 \ - --sysroot=/Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 \ + -DDARWIN -DPOSIX_TTY -arch i386 -arch x86_64 -isysroot $(SDK) \ + -mmacosx-version-min=10.5 \ -iwithsysroot /System/Library/Frameworks/JavaVM.framework/Headers \ -iwithsysroot /System/Library/Frameworks/IOKit.framework/Headers \ -iwithsysroot /System/Library/Frameworks/CoreFoundation.framework/Headers diff --git a/libaltos/libaltos.dylib b/libaltos/libaltos.dylib Binary files differindex 1038817d..cfbd3f54 100755 --- a/libaltos/libaltos.dylib +++ b/libaltos/libaltos.dylib diff --git a/micropeak/FTDI.tar.gz b/micropeak/FTDI.tar.gz Binary files differnew file mode 100644 index 00000000..cd08ecf2 --- /dev/null +++ b/micropeak/FTDI.tar.gz diff --git a/micropeak/Info.plist b/micropeak/Info.plist deleted file mode 100644 index 5705cc1a..00000000 --- a/micropeak/Info.plist +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd"> -<plist version="0.9"> -<dict> - <key>CFBundleName</key> - <string>MicroPeak</string> - <key>CFBundleVersion</key> - <string>1.1.9.2</string> - <key>CFBundleAllowMixedLocalizations</key> - <string>true</string> - <key>CFBundleExecutable</key> - <string>JavaApplicationStub</string> - <key>CFBundleDevelopmentRegion</key> - <string>English</string> - <key>CFBundlePackageType</key> - <string>APPL</string> - <key>CFBundleIdentifier</key> - <string>org.altusmetrum.altosui</string> - <key>CFBundleSignature</key> - <string>Altu</string> - <key>CFBundleGetInfoString</key> - <string>MicroPeak UI version 1.1.9.2</string> - <key>CFBundleInfoDictionaryVersion</key> - <string>6.0</string> - <key>CFBundleIconFile</key> - <string>MicroPeak.icns</string> - <key>Java</key> - <dict> - <key>MainClass</key> - <string>org.altusmetrum.micropeak.MicroPeak</string> - <key>JVMVersion</key> - <string>1.5+</string> - <key>ClassPath</key> - <array> - <string>$JAVAROOT/micropeak.jar</string> - </array> - <key>VMOptions</key> - <array> - <string>-Xms512M</string> - <string>-Xmx512M</string> - <string>-Dosgi.clean=true</string> - </array> - </dict> -</dict> -</plist> diff --git a/micropeak/Info.plist.in b/micropeak/Info.plist.in index d3c17a49..40984c5a 100644 --- a/micropeak/Info.plist.in +++ b/micropeak/Info.plist.in @@ -15,7 +15,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleIdentifier</key> - <string>org.altusmetrum.altosui</string> + <string>org.altusmetrum.micropeak</string> <key>CFBundleSignature</key> <string>Altu</string> <key>CFBundleGetInfoString</key> @@ -34,6 +34,11 @@ <array> <string>$JAVAROOT/micropeak.jar</string> </array> + <key>Properties</key> + <dict> + <key>apple.laf.useScreenMenuBar</key> + <string>true</string> + </dict> <key>VMOptions</key> <array> <string>-Xms512M</string> diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am index 19b23a0f..38945e82 100644 --- a/micropeak/Makefile.am +++ b/micropeak/Makefile.am @@ -88,7 +88,8 @@ LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC) LINUX_EXTRA=micropeak-fat MACOSX_INFO_PLIST=Info.plist -MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) +MACOSX_DRIVER=FTDI.tar.gz +MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_DRIVER) WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON) @@ -212,6 +213,7 @@ $(MACOSX_DIST): $(MACOSX_FILES) mkdir macosx cp -a MicroPeak.app macosx/ cp -p Info.plist macosx/MicroPeak.app/Contents + tar xzf $(MACOSX_DRIVER) -C macosx mkdir -p macosx/MicroPeak.app/Contents/Resources/Java cp -p $(FATJAR) macosx/MicroPeak.app/Contents/Resources/Java/micropeak.jar cp -p libaltos.dylib macosx/MicroPeak.app/Contents/Resources/Java diff --git a/micropeak/MicroPeak.app/Contents/Resources/AltosUIIcon.icns b/micropeak/MicroPeak.app/Contents/Resources/AltosUIIcon.icns Binary files differdeleted file mode 100644 index fe49f362..00000000 --- a/micropeak/MicroPeak.app/Contents/Resources/AltosUIIcon.icns +++ /dev/null diff --git a/micropeak/MicroPeak.app/Contents/Resources/MicroPeak.icns b/micropeak/MicroPeak.app/Contents/Resources/MicroPeak.icns Binary files differnew file mode 100644 index 00000000..9ba83bf5 --- /dev/null +++ b/micropeak/MicroPeak.app/Contents/Resources/MicroPeak.icns |