# HG changeset patch
# User teknolog
# Date 1272409442 -3600
# Node ID aefdc579987d470aa22da5648c739d5daaca273b
# Parent dcfa96a27a8b8fce47a4fcc38eac9a64e09a18a4
Fixes to make Podcatcher compile in S^3 based on Brendan's branch
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/Audio.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Audio.svg Wed Apr 28 00:04:02 2010 +0100
@@ -0,0 +1,23 @@
+
+
+
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/Audio_downloaded.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Audio_downloaded.svg Wed Apr 28 00:04:02 2010 +0100
@@ -0,0 +1,39 @@
+
+
+
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/Audio_downloaded_new.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Audio_downloaded_new.svg Wed Apr 28 00:04:02 2010 +0100
@@ -0,0 +1,54 @@
+
+
+
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/Audio_downloading.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Audio_downloading.svg Wed Apr 28 00:04:02 2010 +0100
@@ -0,0 +1,86 @@
+
+
+
+
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/Audio_failed.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Audio_failed.svg Wed Apr 28 00:04:02 2010 +0100
@@ -0,0 +1,33 @@
+
+
+
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/Audio_new.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Audio_new.svg Wed Apr 28 00:04:02 2010 +0100
@@ -0,0 +1,39 @@
+
+
+
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/Audio_queued.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Audio_queued.svg Wed Apr 28 00:04:02 2010 +0100
@@ -0,0 +1,94 @@
+
+
+
+
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/Audio_suspended.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Audio_suspended.svg Wed Apr 28 00:04:02 2010 +0100
@@ -0,0 +1,75 @@
+
+
+
+
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/Feed.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Feed.svg Wed Apr 28 00:04:02 2010 +0100
@@ -0,0 +1,1574 @@
+
+
+
+
+
+
+
+
+
+
+]>
+
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/Video.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Video.svg Wed Apr 28 00:04:02 2010 +0100
@@ -0,0 +1,127 @@
+
+
+
+
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/Video_downloaded.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Video_downloaded.svg Wed Apr 28 00:04:02 2010 +0100
@@ -0,0 +1,193 @@
+
+
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/Video_downloaded_new.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Video_downloaded_new.svg Wed Apr 28 00:04:02 2010 +0100
@@ -0,0 +1,230 @@
+
+
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/Video_downloading.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Video_downloading.svg Wed Apr 28 00:04:02 2010 +0100
@@ -0,0 +1,169 @@
+
+
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/Video_failed.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Video_failed.svg Wed Apr 28 00:04:02 2010 +0100
@@ -0,0 +1,182 @@
+
+
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/Video_new.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Video_new.svg Wed Apr 28 00:04:02 2010 +0100
@@ -0,0 +1,193 @@
+
+
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/Video_queued.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Video_queued.svg Wed Apr 28 00:04:02 2010 +0100
@@ -0,0 +1,149 @@
+
+
+
+
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/Video_suspended.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Video_suspended.svg Wed Apr 28 00:04:02 2010 +0100
@@ -0,0 +1,167 @@
+
+
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/new/Audio.svg
--- a/application/data/images/new/Audio.svg Tue Apr 27 23:08:51 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-
-
-
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/new/Audio_downloaded.svg
--- a/application/data/images/new/Audio_downloaded.svg Tue Apr 27 23:08:51 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-
-
-
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/new/Audio_downloaded_new.svg
--- a/application/data/images/new/Audio_downloaded_new.svg Tue Apr 27 23:08:51 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-
-
-
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/new/Audio_downloading.svg
--- a/application/data/images/new/Audio_downloading.svg Tue Apr 27 23:08:51 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-
-
-
-
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/new/Audio_failed.svg
--- a/application/data/images/new/Audio_failed.svg Tue Apr 27 23:08:51 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-
-
-
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/new/Audio_new.svg
--- a/application/data/images/new/Audio_new.svg Tue Apr 27 23:08:51 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-
-
-
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/new/Audio_queued.svg
--- a/application/data/images/new/Audio_queued.svg Tue Apr 27 23:08:51 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-
-
-
-
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/new/Audio_suspended.svg
--- a/application/data/images/new/Audio_suspended.svg Tue Apr 27 23:08:51 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-
-
-
-
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/new/Feed.svg
--- a/application/data/images/new/Feed.svg Tue Apr 27 23:08:51 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1574 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-]>
-
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/new/Video.svg
--- a/application/data/images/new/Video.svg Tue Apr 27 23:08:51 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-
-
-
-
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/new/Video_downloaded.svg
--- a/application/data/images/new/Video_downloaded.svg Tue Apr 27 23:08:51 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,193 +0,0 @@
-
-
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/new/Video_downloaded_new.svg
--- a/application/data/images/new/Video_downloaded_new.svg Tue Apr 27 23:08:51 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,230 +0,0 @@
-
-
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/new/Video_downloading.svg
--- a/application/data/images/new/Video_downloading.svg Tue Apr 27 23:08:51 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,169 +0,0 @@
-
-
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/new/Video_failed.svg
--- a/application/data/images/new/Video_failed.svg Tue Apr 27 23:08:51 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,182 +0,0 @@
-
-
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/new/Video_new.svg
--- a/application/data/images/new/Video_new.svg Tue Apr 27 23:08:51 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,193 +0,0 @@
-
-
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/new/Video_queued.svg
--- a/application/data/images/new/Video_queued.svg Tue Apr 27 23:08:51 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,149 +0,0 @@
-
-
-
-
diff -r dcfa96a27a8b -r aefdc579987d application/data/images/new/Video_suspended.svg
--- a/application/data/images/new/Video_suspended.svg Tue Apr 27 23:08:51 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,167 +0,0 @@
-
-
diff -r dcfa96a27a8b -r aefdc579987d application/group/Podcast.mmp
--- a/application/group/Podcast.mmp Tue Apr 27 23:08:51 2010 +0100
+++ b/application/group/Podcast.mmp Wed Apr 28 00:04:02 2010 +0100
@@ -29,10 +29,13 @@
SYSTEMINCLUDE \epoc32\include
SYSTEMINCLUDE \epoc32\include\mmf\common
+#ifdef SYMBIAN_1
SYSTEMINCLUDE \epoc32\include\domain\middleware
+#else
SYSTEMINCLUDE \epoc32\include\mw // for Symbian^3
SYSTEMINCLUDE \epoc32\include\platform\mw // for Symbian^3
-
+SYSTEMINCLUDE \epoc32\include\platform
+#endif
#ifdef SQLITE_INCLUDED
SYSTEMINCLUDE ..\..\engine\sqlite\inc
#else
diff -r dcfa96a27a8b -r aefdc579987d application/group/bld.inf
--- a/application/group/bld.inf Tue Apr 27 23:08:51 2010 +0100
+++ b/application/group/bld.inf Wed Apr 28 00:04:02 2010 +0100
@@ -17,13 +17,44 @@
*/
PRJ_PLATFORMS
-GCCE
-WINSCW
+DEFAULT
PRJ_MMPFILES
+#ifdef SYMBIAN_1
gnumakefile icons.mk
+#endif
+
Podcast.mmp
PRJ_EXPORTS
..\help\podcatcher.hlp \epoc32\winscw\c\resource\help\podcatcher.hlp
+
+#ifndef SYMBIAN_1
+PRJ_EXTENSIONS
+
+START EXTENSION s60/mifconv
+OPTION TARGETFILE Podcast.mif
+OPTION HEADERFILE Podcast.mbg
+OPTION SOURCEDIR ../data/images
+OPTION SOURCES \
+ -c16,1 podcatcher_64px\
+ -c16,1 Audio\
+ -c16,1 Audio_new\
+ -c16,1 Audio_queued\
+ -c16,1 Audio_downloading\
+ -c16,1 Audio_downloaded\
+ -c16,1 Audio_downloaded_new\
+ -c16,1 Audio_failed\
+ -c16,1 Audio_suspended\
+ -c16,1 Video.svg\
+ -c16,1 Video_new.svg\
+ -c16,1 Video_queued.svg\
+ -c16,1 Video_downloading.svg\
+ -c16,1 Video_downloaded.svg\
+ -c16,1 Video_downloaded_new.svg\
+ -c16,1 Video_failed.svg\
+ -c16,1 Video_suspended.svg\
+ -c16,1 Feed
+END
+#endif
diff -r dcfa96a27a8b -r aefdc579987d application/group/icons.mk
--- a/application/group/icons.mk Tue Apr 27 23:08:51 2010 +0100
+++ b/application/group/icons.mk Wed Apr 28 00:04:02 2010 +0100
@@ -25,23 +25,23 @@
RESOURCE :
mifconv $(ICONTARGETFILENAME) /h$(HEADERFILE) /c16,1\
$(DPATH)\podcatcher_64px.svg\
- $(DPATH)\new\Audio.svg\
- $(DPATH)\new\Audio_new.svg\
- $(DPATH)\new\Audio_queued.svg\
- $(DPATH)\new\Audio_downloading.svg\
- $(DPATH)\new\Audio_downloaded.svg\
- $(DPATH)\new\Audio_downloaded_new.svg\
- $(DPATH)\new\Audio_failed.svg\
- $(DPATH)\new\Audio_suspended.svg\
- $(DPATH)\new\Video.svg\
- $(DPATH)\new\Video_new.svg\
- $(DPATH)\new\Video_queued.svg\
- $(DPATH)\new\Video_downloading.svg\
- $(DPATH)\new\Video_downloaded.svg\
- $(DPATH)\new\Video_downloaded_new.svg\
- $(DPATH)\new\Video_failed.svg\
- $(DPATH)\new\Video_suspended.svg\
- $(DPATH)\new\Feed.svg
+ $(DPATH)\Audio.svg\
+ $(DPATH)\Audio_new.svg\
+ $(DPATH)\Audio_queued.svg\
+ $(DPATH)\Audio_downloading.svg\
+ $(DPATH)\Audio_downloaded.svg\
+ $(DPATH)\Audio_downloaded_new.svg\
+ $(DPATH)\Audio_failed.svg\
+ $(DPATH)\Audio_suspended.svg\
+ $(DPATH)\Video.svg\
+ $(DPATH)\Video_new.svg\
+ $(DPATH)\Video_queued.svg\
+ $(DPATH)\Video_downloading.svg\
+ $(DPATH)\Video_downloaded.svg\
+ $(DPATH)\Video_downloaded_new.svg\
+ $(DPATH)\Video_failed.svg\
+ $(DPATH)\Video_suspended.svg\
+ $(DPATH)\Feed.svg
FREEZE : do_nothing
diff -r dcfa96a27a8b -r aefdc579987d engine/group/engine.mmp
--- a/engine/group/engine.mmp Tue Apr 27 23:08:51 2010 +0100
+++ b/engine/group/engine.mmp Wed Apr 28 00:04:02 2010 +0100
@@ -30,6 +30,8 @@
USERINCLUDE ..\inc
SYSTEMINCLUDE \epoc32\include
SYSTEMINCLUDE \epoc32\include\mw // needed for S^3
+SYSTEMINCLUDE \epoc32\include\platform
+SYSTEMINCLUDE \epoc32\include\platform\mw
#ifdef SQLITE_INCLUDED
SYSTEMINCLUDE ..\..\engine\sqlite\inc