Author: tom
Date: Thu Sep 25 11:21:36 2008
New Revision: 2982
URL: http://svn.slimdevices.com?rev=2982&root=Jive&view=rev
Log:
- Updated app icon images away from "Jive" (based on Dean suggestion, just
using the ones from SC).
- Added png, jpeg to macosx build
- Added initial SqueezePlay.app generation
Added:
7.3/trunk/squeezeplay/src/squeezeplay/rsc/icon.icns (with props)
Modified:
7.3/trunk/squeezeplay/src/Makefile.osx
7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am
7.3/trunk/squeezeplay/src/squeezeplay/share/jive/app.png
Modified: 7.3/trunk/squeezeplay/src/Makefile.osx
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/Makefile.osx?rev=2982&root=Jive&r1=2981&r2=2982&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/Makefile.osx (original)
+++ 7.3/trunk/squeezeplay/src/Makefile.osx Thu Sep 25 11:21:36 2008
@@ -161,7 +161,7 @@
#
.PHONY: app portaudio flac libmad tremor squeezeplay squeezeplay_desktop
squeezeplay_test freefont
-app: portaudio flac libmad tremor squeezeplay squeezeplay_desktop
squeezeplay_test freefont
+app: portaudio flac libmad tremor libpng libjpeg squeezeplay
squeezeplay_desktop squeezeplay_test freefont
# portaudio
portaudio_v19_1360/Makefile:
@@ -192,13 +192,29 @@
cd Tremor; make && make install
+# png also add clean
+libpng-1.2.32/Makefile:
+ cd libpng-1.2.32; ./configure --prefix=${PREFIX}
+
+libpng: libpng-1.2.32/Makefile
+ cd libpng-1.2.32; make && make install
+
+
+# jpeg
+jpeg-6b/Makefile:
+ cd jpeg-6b; ./configure --enable-shared --enable-static
--prefix=${PREFIX}
+
+libjpeg: jpeg-6b/Makefile
+ cd jpeg-6b; make && make install
+
+
# squeezeplay
squeezeplay/Makefile:
cd squeezeplay; SDL_CONFIG=${PREFIX}/bin/sdl-config ./configure
--prefix=${PREFIX}
squeezeplay: squeezeplay/Makefile
export PATH=$(BUILD_TOP)/bin:$(PATH); \
- cd squeezeplay; make && make install
+ cd squeezeplay; make && make install && make SqueezePlay_bundle
squeezeplay_desktop/Makefile:
cd squeezeplay_desktop; SDL_CONFIG=${SDL_CONFIG} ./configure
--prefix=${PREFIX}
@@ -228,6 +244,14 @@
@echo "Cleaning: squeezeplay"
-cd squeezeplay; make distclean
@echo "----------------------------------------------------------"
+ @echo "Cleaning: libpng"
+ -cd libpng-1.2.32; make distclean
+ @echo "----------------------------------------------------------"
+ @echo "Cleaning: libjpeg"
+ @echo "----------------------------------------------------------"
+ -cd jpeg-6b; make distclean
+ @echo "Cleaning: squeezeplay"
+ -cd squeezeplay; make distclean
@echo "Cleaning: SDL"
-cd SDL-1.2.13; make distclean; rm -f include/SDL_config.h;
@echo "----------------------------------------------------------"
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am?rev=2982&root=Jive&r1=2981&r2=2982&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am Thu Sep 25 11:21:36 2008
@@ -15,6 +15,91 @@
@find . -name "*.lua" -and \( -exec luac -p '{}' \; -or -print \) >
badsyntax
@test \! -s badsyntax
@rm -f badsyntax
+
+
+OSX_LIB_DIR = $(top_builddir)/../../build/osx/lib
+OSX_BUILD_DIR = $(top_builddir)/../../build/osx
+JIVE_DEPENDENCIES_LIB_DIR = $(top_builddir)/.libs
+JIVE_STATIC_PROGRAM = SqueezePlay
+
+OSX_STATIC_LIBS = `$(SDL_CONFIG) --static-libs` \
+ $(OSX_LIB_DIR)/liblua.a $(OSX_LIB_DIR)/libtolua++.a \
+ $(OSX_LIB_DIR)/libFLAC.a \
+ $(OSX_LIB_DIR)/libfreetype.a \
+ $(OSX_LIB_DIR)/libmad.a \
+ $(OSX_LIB_DIR)/libvorbisidec.a \
+ $(OSX_LIB_DIR)/libportaudio.a \
+ $(OSX_LIB_DIR)/libSDL.a \
+ $(OSX_LIB_DIR)/libSDL_gfx.a \
+ $(OSX_LIB_DIR)/libSDL_image.a \
+ $(OSX_LIB_DIR)/libSDL_ttf.a \
+ $(OSX_LIB_DIR)/libSDLmain.a \
+ $(OSX_LIB_DIR)/libpng.a \
+ $(OSX_LIB_DIR)/libjpeg.a \
+ $(JIVE_DEPENDENCIES_LIB_DIR)/libjiveaudio.a
$(JIVE_DEPENDENCIES_LIB_DIR)/libjivenet.a
$(JIVE_DEPENDENCIES_LIB_DIR)/libjiveui.a
+
+SqueezePlay: $(jive_OBJECTS) $(jive_DEPENDENCIES)
+ echo 'jive_LDADD: $(jive_LDADD)'
+ echo 'jive_LDFLAGS: $(jive_LDFLAGS)'
+ echo 'LDFLAGS: $(LDFLAGS)'
+ echo 'LIBS: $(LIBS)'
+ $(CXX) $(LDFLAGS) \
+ -force_cpusubtype_ALL \
+ -framework CoreAudio \
+ -o $(JIVE_STATIC_PROGRAM) $(jive_OBJECTS) \
+ $(OSX_STATIC_LIBS) \
+ -lSystemStubs \
+ -lz
+
+BUNDLE_NAME = SqueezePlay.app
+APP_NAME = SqueezePlay Beta
+BUNDLE_CONTENTS = $(BUNDLE_NAME)/Contents
+PLIST_FILE = $(BUNDLE_CONTENTS)/Info.plist
+
+#don't want it next line evualted on usage, not sure how to avoid other thatn
this hack
+VERSION_TEXT = $(shell cat ../squeezeplay.version)r$(shell svnversion -n
..|sed "s/M$$//g")
+ICNS_NAME = icon.icns
+
+#todo: make clean work the right way(not the rm -rf hackery seen below)
+SqueezePlay_bundle: SqueezePlay
+ rm -rf $(BUNDLE_CONTENTS)/
+ mkdir -p $(BUNDLE_CONTENTS)/MacOS
+ mkdir -p $(BUNDLE_CONTENTS)/Resources
+ mkdir -p $(BUNDLE_CONTENTS)/lib
+ echo "APPLSQPL" > $(BUNDLE_CONTENTS)/PkgInfo
+ cp -R $(OSX_BUILD_DIR)/share/ $(BUNDLE_CONTENTS)/share
+ cp -R $(OSX_BUILD_DIR)/lib/lua/ $(BUNDLE_CONTENTS)/lib/lua
+ cp rsc/$(ICNS_NAME) $(BUNDLE_CONTENTS)/Resources
+ echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > $(PLIST_FILE)
+ echo "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\"
\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\";>" >> $(PLIST_FILE)
+ echo "<plist version=\"1.0\">" >> $(PLIST_FILE)
+ echo "<dict>" >> $(PLIST_FILE)
+ echo " <key>CFBundleDevelopmentRegion</key>" >> $(PLIST_FILE)
+ echo " <string>English</string>" >> $(PLIST_FILE)
+ echo " <key>CFBundleExecutable</key>" >> $(PLIST_FILE)
+ echo " <string>$(JIVE_STATIC_PROGRAM)</string>" >> $(PLIST_FILE)
+ echo " <key>CFBundleDisplayName</key>" >> $(PLIST_FILE)
+ echo " <string>$(APP_NAME)</string>" >> $(PLIST_FILE)
+ echo " <key>CFBundleIdentifier</key>" >> $(PLIST_FILE)
+ echo " <string>com.logitech.squeezeplay</string>" >> $(PLIST_FILE)
+ echo " <key>CFBundleIconFile</key>" >> $(PLIST_FILE)
+ echo " <string>$(ICNS_NAME)</string>" >> $(PLIST_FILE)
+ echo " <key>CFBundleInfoDictionaryVersion</key>" >> $(PLIST_FILE)
+ echo " <string>6.0</string>" >> $(PLIST_FILE)
+ echo " <key>CFBundlePackageType</key>" >> $(PLIST_FILE)
+ echo " <string>APPL</string>" >> $(PLIST_FILE)
+ echo " <key>CFBundleSignature</key>" >> $(PLIST_FILE)
+ echo " <string>SQPL</string>" >> $(PLIST_FILE)
+ echo " <key>CFBundleShortVersionString</key>" >> $(PLIST_FILE)
+ echo " <string>$(VERSION_TEXT)</string>" >> $(PLIST_FILE)
+ echo " <key>CFBundleVersion</key>" >> $(PLIST_FILE)
+ echo " <string>$(VERSION_TEXT)</string>" >> $(PLIST_FILE)
+ echo " <key>CFBundleGetInfoString</key>" >> $(PLIST_FILE)
+ echo " <string>$(APP_NAME) $(VERSION_TEXT), Copyright 2008
Logitech</string>" >> $(PLIST_FILE)
+ echo "</dict>" >> $(PLIST_FILE)
+ echo "</plist>" >> $(PLIST_FILE)
+ chmod 644 $(BUNDLE_CONTENTS)/Resources/*
+ $(INSTALL_PROGRAM) $(JIVE_STATIC_PROGRAM) $(BUNDLE_CONTENTS)/MacOS/
# Convenience library:
Added: 7.3/trunk/squeezeplay/src/squeezeplay/rsc/icon.icns
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/rsc/icon.icns?rev=2982&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange: 7.3/trunk/squeezeplay/src/squeezeplay/rsc/icon.icns
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/app.png
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/jive/app.png?rev=2982&root=Jive&r1=2981&r2=2982&view=diff
==============================================================================
Binary files - no diff available.
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
![[Jive-Checkins] r2982 - in /7.3/trunk/squeezeplay/src: Makefile.osx squeezeplay/Makefile.am squeezeplay/rsc/icon.icns squeezeplay/share/jive/app.png](/search?l=jive-checkins@lists.slimdevices.com&q=subject:%22%5C%5BJive%5C-Checkins%5C%5D+r2982+%5C-+in+%5C%2F7.3%5C%2Ftrunk%5C%2Fsqueezeplay%5C%2Fsrc%5C%3A+Makefile.osx+squeezeplay%5C%2FMakefile.am+squeezeplay%5C%2Frsc%5C%2Ficon.icns+squeezeplay%5C%2Fshare%5C%2Fjive%5C%2Fapp.png%22&o=newest){kind=link}
