[Scummvm-cvs-logs] SF.net SVN: scummvm:[42037] tools/branches/gsoc2009-gui

[joostp at users.sourceforge.net]

Revision: 42037
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42037&view=rev
Author:   joostp
Date:     2009-07-02 20:58:57 +0000 (Thu, 02 Jul 2009)

Log Message:
-----------
fix for building of standalone versions without EXPORT_MAIN defined

Modified Paths:
--------------
    tools/branches/gsoc2009-gui/compress_agos.cpp
    tools/branches/gsoc2009-gui/compress_gob.cpp
    tools/branches/gsoc2009-gui/compress_kyra.cpp
    tools/branches/gsoc2009-gui/compress_queen.cpp
    tools/branches/gsoc2009-gui/compress_saga.cpp
    tools/branches/gsoc2009-gui/compress_scumm_bun.cpp
    tools/branches/gsoc2009-gui/compress_scumm_san.cpp
    tools/branches/gsoc2009-gui/compress_scumm_sou.cpp
    tools/branches/gsoc2009-gui/compress_sword1.cpp
    tools/branches/gsoc2009-gui/compress_sword2.cpp
    tools/branches/gsoc2009-gui/compress_touche.cpp
    tools/branches/gsoc2009-gui/compress_tucker.cpp
    tools/branches/gsoc2009-gui/encode_dxa.cpp
    tools/branches/gsoc2009-gui/extract_agos.cpp
    tools/branches/gsoc2009-gui/extract_gob_stk.cpp
    tools/branches/gsoc2009-gui/extract_kyra.cpp
    tools/branches/gsoc2009-gui/extract_loom_tg16.cpp
    tools/branches/gsoc2009-gui/extract_mm_apple.cpp
    tools/branches/gsoc2009-gui/extract_mm_c64.cpp
    tools/branches/gsoc2009-gui/extract_mm_nes.cpp
    tools/branches/gsoc2009-gui/extract_parallaction.cpp
    tools/branches/gsoc2009-gui/extract_zak_c64.cpp

Modified: tools/branches/gsoc2009-gui/compress_agos.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_agos.cpp	2009-07-02 20:29:14 UTC (rev 42036)
+++ tools/branches/gsoc2009-gui/compress_agos.cpp	2009-07-02 20:58:57 UTC (rev 42037)
@@ -282,7 +282,7 @@
 	return(0);
 }
 
-#ifdef UNIX
+#if defined(UNIX) && defined(EXPORT_MAIN)
 int main(int argc, char *argv[]) __attribute__((weak));
 int main(int argc, char *argv[]) {
 	return export_main(compress_agos)(argc, argv);

Modified: tools/branches/gsoc2009-gui/compress_gob.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_gob.cpp	2009-07-02 20:29:14 UTC (rev 42036)
+++ tools/branches/gsoc2009-gui/compress_gob.cpp	2009-07-02 20:58:57 UTC (rev 42037)
@@ -396,7 +396,7 @@
 		return false;
 }
 
-#ifdef UNIX
+#if defined(UNIX) && defined(EXPORT_MAIN)
 int main(int argc, char *argv[]) __attribute__((weak));
 int main(int argc, char *argv[]) {
 	return export_main(compress_gob)(argc, argv);

Modified: tools/branches/gsoc2009-gui/compress_kyra.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_kyra.cpp	2009-07-02 20:29:14 UTC (rev 42036)
+++ tools/branches/gsoc2009-gui/compress_kyra.cpp	2009-07-02 20:58:57 UTC (rev 42037)
@@ -422,7 +422,7 @@
 	error("Unknown filetype of file: '%s'", infile->getFullPath());
 }
 
-#ifdef UNIX
+#if defined(UNIX) && defined(EXPORT_MAIN)
 int main(int argc, char *argv[]) __attribute__((weak));
 int main(int argc, char *argv[]) {
 	return export_main(compress_kyra)(argc, argv);

Modified: tools/branches/gsoc2009-gui/compress_queen.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_queen.cpp	2009-07-02 20:29:14 UTC (rev 42036)
+++ tools/branches/gsoc2009-gui/compress_queen.cpp	2009-07-02 20:58:57 UTC (rev 42037)
@@ -385,7 +385,7 @@
 	return 0;
 }
 
-#ifdef UNIX
+#if defined(UNIX) && defined(EXPORT_MAIN)
 int main(int argc, char *argv[]) __attribute__((weak));
 int main(int argc, char *argv[]) {
 	return export_main(compress_queen)(argc, argv);

Modified: tools/branches/gsoc2009-gui/compress_saga.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_saga.cpp	2009-07-02 20:29:14 UTC (rev 42036)
+++ tools/branches/gsoc2009-gui/compress_saga.cpp	2009-07-02 20:58:57 UTC (rev 42037)
@@ -494,7 +494,7 @@
 	return 0;
 }
 
-#ifdef UNIX
+#if defined(UNIX) && defined(EXPORT_MAIN)
 int main(int argc, char *argv[]) __attribute__((weak));
 int main(int argc, char *argv[]) {
 	return export_main(compress_saga)(argc, argv);

Modified: tools/branches/gsoc2009-gui/compress_scumm_bun.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_scumm_bun.cpp	2009-07-02 20:29:14 UTC (rev 42036)
+++ tools/branches/gsoc2009-gui/compress_scumm_bun.cpp	2009-07-02 20:58:57 UTC (rev 42037)
@@ -1198,7 +1198,7 @@
 	return 0;
 }
 
-#ifdef UNIX
+#if defined(UNIX) && defined(EXPORT_MAIN)
 int main(int argc, char *argv[]) __attribute__((weak));
 int main(int argc, char *argv[]) {
 	return export_main(compress_scumm_bun)(argc, argv);

Modified: tools/branches/gsoc2009-gui/compress_scumm_san.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_scumm_san.cpp	2009-07-02 20:29:14 UTC (rev 42036)
+++ tools/branches/gsoc2009-gui/compress_scumm_san.cpp	2009-07-02 20:58:57 UTC (rev 42037)
@@ -896,7 +896,7 @@
 	return 0;
 }
 
-#ifdef UNIX
+#if defined(UNIX) && defined(EXPORT_MAIN)
 int main(int argc, char *argv[]) __attribute__((weak));
 int main(int argc, char *argv[]) {
         return export_main(compress_scumm_san)(argc, argv);

Modified: tools/branches/gsoc2009-gui/compress_scumm_sou.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_scumm_sou.cpp	2009-07-02 20:29:14 UTC (rev 42036)
+++ tools/branches/gsoc2009-gui/compress_scumm_sou.cpp	2009-07-02 20:58:57 UTC (rev 42037)
@@ -211,7 +211,7 @@
 	return 0;
 }
 
-#ifdef UNIX
+#if defined(UNIX) && defined(EXPORT_MAIN)
 int main(int argc, char *argv[]) __attribute__((weak));
 int main(int argc, char *argv[]) {
 	return export_main(compress_scumm_sou)(argc, argv);

Modified: tools/branches/gsoc2009-gui/compress_sword1.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_sword1.cpp	2009-07-02 20:29:14 UTC (rev 42036)
+++ tools/branches/gsoc2009-gui/compress_sword1.cpp	2009-07-02 20:58:57 UTC (rev 42037)
@@ -655,7 +655,7 @@
 	return EXIT_SUCCESS;
 }
 
-#ifdef UNIX
+#if defined(UNIX) && defined(EXPORT_MAIN)
 int main(int argc, char *argv[]) __attribute__((weak));
 int main(int argc, char *argv[]) {
 	return export_main(compress_sword1)(argc, argv);

Modified: tools/branches/gsoc2009-gui/compress_sword2.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_sword2.cpp	2009-07-02 20:29:14 UTC (rev 42036)
+++ tools/branches/gsoc2009-gui/compress_sword2.cpp	2009-07-02 20:58:57 UTC (rev 42037)
@@ -239,7 +239,7 @@
 	return EXIT_SUCCESS;
 }
 
-#ifdef UNIX
+#if defined(UNIX) && defined(EXPORT_MAIN)
 int main(int argc, char *argv[]) __attribute__((weak));
 int main(int argc, char *argv[]) {
 	return export_main(compress_sword2)(argc, argv);

Modified: tools/branches/gsoc2009-gui/compress_touche.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_touche.cpp	2009-07-02 20:29:14 UTC (rev 42036)
+++ tools/branches/gsoc2009-gui/compress_touche.cpp	2009-07-02 20:58:57 UTC (rev 42037)
@@ -219,7 +219,7 @@
 	return 0;
 }
 
-#ifdef UNIX
+#if defined(UNIX) && defined(EXPORT_MAIN)
 int main(int argc, char *argv[]) __attribute__((weak));
 int main(int argc, char *argv[]) {
 	return export_main(compress_touche)(argc, argv);

Modified: tools/branches/gsoc2009-gui/compress_tucker.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_tucker.cpp	2009-07-02 20:29:14 UTC (rev 42036)
+++ tools/branches/gsoc2009-gui/compress_tucker.cpp	2009-07-02 20:58:57 UTC (rev 42037)
@@ -570,7 +570,7 @@
 	return 0;
 }
 
-#ifdef UNIX
+#if defined(UNIX) && defined(EXPORT_MAIN)
 int main(int argc, char *argv[]) __attribute__((weak));
 int main(int argc, char *argv[]) {
 	return export_main(compress_tucker)(argc, argv);

Modified: tools/branches/gsoc2009-gui/encode_dxa.cpp
===================================================================
--- tools/branches/gsoc2009-gui/encode_dxa.cpp	2009-07-02 20:29:14 UTC (rev 42036)
+++ tools/branches/gsoc2009-gui/encode_dxa.cpp	2009-07-02 20:58:57 UTC (rev 42037)
@@ -796,7 +796,7 @@
 	return 0;
 }
 
-#ifdef UNIX
+#if defined(UNIX) && defined(EXPORT_MAIN)
 int main(int argc, char *argv[]) __attribute__((weak));
 int main(int argc, char *argv[]) {
 	return export_main(compress_dxa)(argc, argv);

Modified: tools/branches/gsoc2009-gui/extract_agos.cpp
===================================================================
--- tools/branches/gsoc2009-gui/extract_agos.cpp	2009-07-02 20:29:14 UTC (rev 42036)
+++ tools/branches/gsoc2009-gui/extract_agos.cpp	2009-07-02 20:58:57 UTC (rev 42037)
@@ -236,7 +236,7 @@
 	return 0;
 }
 
-#ifdef UNIX
+#if defined(UNIX) && defined(EXPORT_MAIN)
 int main(int argc, char *argv[]) __attribute__((weak));
 int main(int argc, char *argv[]) {
 	return export_main(extract_agos)(argc, argv);

Modified: tools/branches/gsoc2009-gui/extract_gob_stk.cpp
===================================================================
--- tools/branches/gsoc2009-gui/extract_gob_stk.cpp	2009-07-02 20:29:14 UTC (rev 42036)
+++ tools/branches/gsoc2009-gui/extract_gob_stk.cpp	2009-07-02 20:58:57 UTC (rev 42037)
@@ -471,7 +471,7 @@
 	return unpacked;
 }
 
-#ifdef UNIX
+#if defined(UNIX) && defined(EXPORT_MAIN)
 int main(int argc, char *argv[]) __attribute__((weak));
 int main(int argc, char *argv[]) {
 	return export_main(extract_gob_stk)(argc, argv);

Modified: tools/branches/gsoc2009-gui/extract_kyra.cpp
===================================================================
--- tools/branches/gsoc2009-gui/extract_kyra.cpp	2009-07-02 20:29:14 UTC (rev 42036)
+++ tools/branches/gsoc2009-gui/extract_kyra.cpp	2009-07-02 20:58:57 UTC (rev 42037)
@@ -113,7 +113,7 @@
 	return 0;
 }
 
-#ifdef UNIX
+#if defined(UNIX) && defined(EXPORT_MAIN)
 int main(int argc, char *argv[]) __attribute__((weak));
 int main(int argc, char *argv[]) {
 	return export_main(extract_kyra)(argc, argv);

Modified: tools/branches/gsoc2009-gui/extract_loom_tg16.cpp
===================================================================
--- tools/branches/gsoc2009-gui/extract_loom_tg16.cpp	2009-07-02 20:29:14 UTC (rev 42036)
+++ tools/branches/gsoc2009-gui/extract_loom_tg16.cpp	2009-07-02 20:58:57 UTC (rev 42037)
@@ -1415,7 +1415,7 @@
 	return 0;
 }
 
-#ifdef UNIX
+#if defined(UNIX) && defined(EXPORT_MAIN)
 int main(int argc, char *argv[]) __attribute__((weak));
 int main(int argc, char *argv[]) {
 	return export_main(extract_loom_tg16)(argc, argv);

Modified: tools/branches/gsoc2009-gui/extract_mm_apple.cpp
===================================================================
--- tools/branches/gsoc2009-gui/extract_mm_apple.cpp	2009-07-02 20:29:14 UTC (rev 42036)
+++ tools/branches/gsoc2009-gui/extract_mm_apple.cpp	2009-07-02 20:58:57 UTC (rev 42037)
@@ -177,7 +177,7 @@
 	return 0;
 }
 
-#ifdef UNIX
+#if defined(UNIX) && defined(EXPORT_MAIN)
 int main(int argc, char *argv[]) __attribute__((weak));
 int main(int argc, char *argv[]) {
 	return export_main(extract_mm_apple)(argc, argv);

Modified: tools/branches/gsoc2009-gui/extract_mm_c64.cpp
===================================================================
--- tools/branches/gsoc2009-gui/extract_mm_c64.cpp	2009-07-02 20:29:14 UTC (rev 42036)
+++ tools/branches/gsoc2009-gui/extract_mm_c64.cpp	2009-07-02 20:58:57 UTC (rev 42037)
@@ -175,7 +175,7 @@
 	return 0;
 }
 
-#ifdef UNIX
+#if defined(UNIX) && defined(EXPORT_MAIN)
 int main(int argc, char *argv[]) __attribute__((weak));
 int main(int argc, char *argv[]) {
 	return export_main(extract_mm_c64)(argc, argv);

Modified: tools/branches/gsoc2009-gui/extract_mm_nes.cpp
===================================================================
--- tools/branches/gsoc2009-gui/extract_mm_nes.cpp	2009-07-02 20:29:14 UTC (rev 42036)
+++ tools/branches/gsoc2009-gui/extract_mm_nes.cpp	2009-07-02 20:58:57 UTC (rev 42037)
@@ -1359,7 +1359,7 @@
 	return 0;
 }
 
-#ifdef UNIX
+#if defined(UNIX) && defined(EXPORT_MAIN)
 int main(int argc, char *argv[]) __attribute__((weak));
 int main(int argc, char *argv[]) {
 	return export_main(extract_mm_nes)(argc, argv);

Modified: tools/branches/gsoc2009-gui/extract_parallaction.cpp
===================================================================
--- tools/branches/gsoc2009-gui/extract_parallaction.cpp	2009-07-02 20:29:14 UTC (rev 42036)
+++ tools/branches/gsoc2009-gui/extract_parallaction.cpp	2009-07-02 20:58:57 UTC (rev 42037)
@@ -348,7 +348,7 @@
 	return 0;
 }
 
-#ifdef UNIX
+#if defined(UNIX) && defined(EXPORT_MAIN)
 int main(int argc, char *argv[]) __attribute__((weak));
 int main(int argc, char *argv[]) {
 	return export_main(extract_parallaction)(argc, argv);

Modified: tools/branches/gsoc2009-gui/extract_zak_c64.cpp
===================================================================
--- tools/branches/gsoc2009-gui/extract_zak_c64.cpp	2009-07-02 20:29:14 UTC (rev 42036)
+++ tools/branches/gsoc2009-gui/extract_zak_c64.cpp	2009-07-02 20:58:57 UTC (rev 42037)
@@ -177,7 +177,7 @@
 	return 0;
 }
 
-#ifdef UNIX
+#if defined(UNIX) && defined(EXPORT_MAIN)
 int main(int argc, char *argv[]) __attribute__((weak));
 int main(int argc, char *argv[]) {
 	return export_main(extract_zak_c64)(argc, argv);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.