Having a default weak codec_main symbol doesn't seem to be working out for compiling the sim under cygwin in at least some cases. Just implement it explicitly in all cases.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29789 a1c6a512-1295-4272-9138-f99709370657

6 files changed, 40 insertions, 10 deletions

diff --git a/apps/codecs/asap.c b/apps/codecs/asap.c
index f12dc6a..5d098ed 100644
--- a/apps/codecs/asap.c
+++ b/apps/codecs/asap.c
@@ -29,6 +29,14 @@ CODEC_HEADER
 static byte samples[CHUNK_SIZE] IBSS_ATTR;   /* The sample buffer */
 static ASAP_State asap;         /* asap codec state */
 
+/* this is the codec entry point */
+enum codec_status codec_main(enum codec_entry_call_reason reason)
+{
+    /* Nothing to do */
+    return CODEC_OK;
+    (void)reason;
+}
+
 /* this is called for each file to process */
 enum codec_status codec_run(void)
 {
diff --git a/apps/codecs/atrac3_oma.c b/apps/codecs/atrac3_oma.c
index ab24783..50f7c8f 100644
--- a/apps/codecs/atrac3_oma.c
+++ b/apps/codecs/atrac3_oma.c
@@ -33,6 +33,14 @@ CODEC_HEADER
 
 static ATRAC3Context q IBSS_ATTR;
 
+/* this is the codec entry point */
+enum codec_status codec_main(enum codec_entry_call_reason reason)
+{
+    /* Nothing to do */
+    return CODEC_OK;
+    (void)reason;
+}
+
 /* this is called for each file to process */
 enum codec_status codec_run(void)
 {
diff --git a/apps/codecs/atrac3_rm.c b/apps/codecs/atrac3_rm.c
index 1322e91..4c61989 100644
--- a/apps/codecs/atrac3_rm.c
+++ b/apps/codecs/atrac3_rm.c
@@ -41,6 +41,14 @@ static void init_rm(RMContext *rmctx)
     memcpy(ci->id3->id3v2buf, (char*)rmctx->codec_extradata, rmctx->extradata_size*sizeof(char));
 }
 
+/* this is the codec entry point */
+enum codec_status codec_main(enum codec_entry_call_reason reason)
+{
+    /* Nothing to do */
+    return CODEC_OK;
+    (void)reason;
+}
+
 /* this is called for each file to process */
 enum codec_status codec_run(void)
 {
diff --git a/apps/codecs/cook.c b/apps/codecs/cook.c
index a6b4a11..8273969 100644
--- a/apps/codecs/cook.c
+++ b/apps/codecs/cook.c
@@ -38,6 +38,14 @@ static void init_rm(RMContext *rmctx)
     memcpy(rmctx, (void*)(( (intptr_t)ci->id3->id3v2buf + 3 ) &~ 3), sizeof(RMContext));
 }
 
+/* this is the codec entry point */
+enum codec_status codec_main(enum codec_entry_call_reason reason)
+{
+    /* Nothing to do */
+    return CODEC_OK;
+    (void)reason;
+}
+
 /* this is called for each file to process */
 enum codec_status codec_run(void)
 {
diff --git a/apps/codecs/lib/codeclib.c b/apps/codecs/lib/codeclib.c
index 443c0bb..3a46f6d 100644
--- a/apps/codecs/lib/codeclib.c
+++ b/apps/codecs/lib/codeclib.c
@@ -33,16 +33,6 @@ unsigned char* mp3buf;     // The actual MP3 buffer from Rockbox
 unsigned char* mallocbuf;  // 512K from the start of MP3 buffer
 unsigned char* filebuf;    // The rest of the MP3 buffer
 
-/* this is the default codec entry point for when nothing needs to be done
-   on load or unload */
-enum codec_status __attribute__((weak))
-codec_main(enum codec_entry_call_reason reason)
-{
-    /* Nothing to do */
-    return CODEC_OK;
-    (void)reason;
-}
-
 int codec_init(void)
 {
     mem_ptr = 0;
diff --git a/apps/codecs/speex.c b/apps/codecs/speex.c
index e394efc..85ee9c4 100644
--- a/apps/codecs/speex.c
+++ b/apps/codecs/speex.c
@@ -367,6 +367,14 @@ static void *process_header(spx_ogg_packet *op,
     return st;
 }
 
+/* this is the codec entry point */
+enum codec_status codec_main(enum codec_entry_call_reason reason)
+{
+    /* Nothing to do */
+    return CODEC_OK;
+    (void)reason;
+}
+
 /* this is called for each file to process */
 enum codec_status codec_run(void)
 {