From 5f58e888a1f22bd4decde6562017fe57a4ff30eb Mon Sep 17 00:00:00 2001
From: Joost Peters <joostp@scummvm.org>
Date: Thu, 2 Jul 2009 20:58:57 +0000
Subject: [PATCH] fix for building of standalone versions without EXPORT_MAIN
 defined

svn-id: r42037
---
 compress_agos.cpp        | 2 +-
 compress_gob.cpp         | 2 +-
 compress_kyra.cpp        | 2 +-
 compress_queen.cpp       | 2 +-
 compress_saga.cpp        | 2 +-
 compress_scumm_bun.cpp   | 2 +-
 compress_scumm_san.cpp   | 2 +-
 compress_scumm_sou.cpp   | 2 +-
 compress_sword1.cpp      | 2 +-
 compress_sword2.cpp      | 2 +-
 compress_touche.cpp      | 2 +-
 compress_tucker.cpp      | 2 +-
 encode_dxa.cpp           | 2 +-
 extract_agos.cpp         | 2 +-
 extract_gob_stk.cpp      | 2 +-
 extract_kyra.cpp         | 2 +-
 extract_loom_tg16.cpp    | 2 +-
 extract_mm_apple.cpp     | 2 +-
 extract_mm_c64.cpp       | 2 +-
 extract_mm_nes.cpp       | 2 +-
 extract_parallaction.cpp | 2 +-
 extract_zak_c64.cpp      | 2 +-
 22 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/compress_agos.cpp b/compress_agos.cpp
index 837f82ad..6a9c49ef 100644
--- a/compress_agos.cpp
+++ b/compress_agos.cpp
@@ -282,7 +282,7 @@ int export_main(compress_agos)(int argc, char *argv[]) {
 	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);
diff --git a/compress_gob.cpp b/compress_gob.cpp
index 7d62ba19..ec2f270d 100644
--- a/compress_gob.cpp
+++ b/compress_gob.cpp
@@ -396,7 +396,7 @@ bool checkDico(byte *unpacked, uint32 unpackedIndex, int32 counter, byte *dico,
 		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);
diff --git a/compress_kyra.cpp b/compress_kyra.cpp
index f3afaba5..ba5f088e 100644
--- a/compress_kyra.cpp
+++ b/compress_kyra.cpp
@@ -422,7 +422,7 @@ bool detectKyra3File(Filename *infile) {
 	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);
diff --git a/compress_queen.cpp b/compress_queen.cpp
index 8a220b02..f24ace3e 100644
--- a/compress_queen.cpp
+++ b/compress_queen.cpp
@@ -385,7 +385,7 @@ int export_main(compress_queen)(int argc, char *argv[]) {
 	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);
diff --git a/compress_saga.cpp b/compress_saga.cpp
index 8cbd5604..b6231db4 100644
--- a/compress_saga.cpp
+++ b/compress_saga.cpp
@@ -494,7 +494,7 @@ int export_main(compress_saga)(int argc, char *argv[]) {
 	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);
diff --git a/compress_scumm_bun.cpp b/compress_scumm_bun.cpp
index a0bef701..857963bc 100644
--- a/compress_scumm_bun.cpp
+++ b/compress_scumm_bun.cpp
@@ -1198,7 +1198,7 @@ int export_main(compress_scumm_bun)(int argc, char *argv[]) {
 	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);
diff --git a/compress_scumm_san.cpp b/compress_scumm_san.cpp
index 9a6b08a3..ee74d5f2 100644
--- a/compress_scumm_san.cpp
+++ b/compress_scumm_san.cpp
@@ -896,7 +896,7 @@ skip:
 	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);
diff --git a/compress_scumm_sou.cpp b/compress_scumm_sou.cpp
index 6f84c247..def27fba 100644
--- a/compress_scumm_sou.cpp
+++ b/compress_scumm_sou.cpp
@@ -211,7 +211,7 @@ int export_main(compress_scumm_sou)(int argc, char *argv[]) {
 	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);
diff --git a/compress_sword1.cpp b/compress_sword1.cpp
index eb953381..6751a332 100644
--- a/compress_sword1.cpp
+++ b/compress_sword1.cpp
@@ -655,7 +655,7 @@ int export_main(compress_sword1)(int argc, char *argv[]) {
 	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);
diff --git a/compress_sword2.cpp b/compress_sword2.cpp
index 3111b483..d6f7450e 100644
--- a/compress_sword2.cpp
+++ b/compress_sword2.cpp
@@ -239,7 +239,7 @@ int export_main(compress_sword2)(int argc, char *argv[]) {
 	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);
diff --git a/compress_touche.cpp b/compress_touche.cpp
index 30a58c27..3c70ac65 100644
--- a/compress_touche.cpp
+++ b/compress_touche.cpp
@@ -219,7 +219,7 @@ int export_main(compress_touche)(int argc, char *argv[]) {
 	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);
diff --git a/compress_tucker.cpp b/compress_tucker.cpp
index e4774776..60ab99e6 100644
--- a/compress_tucker.cpp
+++ b/compress_tucker.cpp
@@ -570,7 +570,7 @@ int export_main(compress_tucker)(int argc, char *argv[]) {
 	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);
diff --git a/encode_dxa.cpp b/encode_dxa.cpp
index b267567b..c034a911 100644
--- a/encode_dxa.cpp
+++ b/encode_dxa.cpp
@@ -796,7 +796,7 @@ int export_main(compress_dxa)(int argc, char *argv[]) {
 	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);
diff --git a/extract_agos.cpp b/extract_agos.cpp
index 20f6132b..7fa029b3 100644
--- a/extract_agos.cpp
+++ b/extract_agos.cpp
@@ -236,7 +236,7 @@ int export_main(extract_agos)(int argc, char *argv[]) {
 	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);
diff --git a/extract_gob_stk.cpp b/extract_gob_stk.cpp
index df39d7b9..70d5b1af 100644
--- a/extract_gob_stk.cpp
+++ b/extract_gob_stk.cpp
@@ -471,7 +471,7 @@ byte *unpackPreGobData(byte *src, uint32 &size, uint32 &compSize) {
 	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);
diff --git a/extract_kyra.cpp b/extract_kyra.cpp
index 68f7c944..2362323b 100644
--- a/extract_kyra.cpp
+++ b/extract_kyra.cpp
@@ -113,7 +113,7 @@ int export_main(extract_kyra)(int argc, char *argv[]) {
 	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);
diff --git a/extract_loom_tg16.cpp b/extract_loom_tg16.cpp
index 655bad67..0e3b30ea 100644
--- a/extract_loom_tg16.cpp
+++ b/extract_loom_tg16.cpp
@@ -1415,7 +1415,7 @@ int export_main(extract_loom_tg16)(int argc, char *argv[]) {
 	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);
diff --git a/extract_mm_apple.cpp b/extract_mm_apple.cpp
index 1fce4528..5e8e36c7 100644
--- a/extract_mm_apple.cpp
+++ b/extract_mm_apple.cpp
@@ -177,7 +177,7 @@ int export_main(extract_mm_apple)(int argc, char *argv[]) {
 	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);
diff --git a/extract_mm_c64.cpp b/extract_mm_c64.cpp
index 4ac38107..8baef6f0 100644
--- a/extract_mm_c64.cpp
+++ b/extract_mm_c64.cpp
@@ -175,7 +175,7 @@ int export_main(extract_mm_c64)(int argc, char *argv[]) {
 	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);
diff --git a/extract_mm_nes.cpp b/extract_mm_nes.cpp
index 51dad593..57232551 100644
--- a/extract_mm_nes.cpp
+++ b/extract_mm_nes.cpp
@@ -1359,7 +1359,7 @@ int export_main(extract_mm_nes)(int argc, char *argv[]) {
 	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);
diff --git a/extract_parallaction.cpp b/extract_parallaction.cpp
index 0bcaee62..1f7e676c 100644
--- a/extract_parallaction.cpp
+++ b/extract_parallaction.cpp
@@ -348,7 +348,7 @@ int export_main(extract_parallaction)(int argc, char *argv[]) {
 	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);
diff --git a/extract_zak_c64.cpp b/extract_zak_c64.cpp
index ad9f2d90..67303f70 100644
--- a/extract_zak_c64.cpp
+++ b/extract_zak_c64.cpp
@@ -177,7 +177,7 @@ int export_main(extract_zak_c64)(int argc, char *argv[]) {
 	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);