Fix problems with Allegro + MacOSX + main().

Renamed the application main to app_main() so it's called from "she"
library. It's impossible to avoid dirty main() tricks with Allegro 4.

src/app/color_unittest.cpp

@@ -16,7 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <gtest/gtest.h>
+#include "tests/test.h"
+
 #include "app/color.h"
 
 inline std::ostream& operator<<(std::ostream& os, const Color& color) {
@@ -50,9 +51,3 @@ TEST(Color, toString)
   EXPECT_EQ("rgb{32,16,255}", Color::fromRgb(32, 16, 255).toString());
   EXPECT_EQ("hsv{32,64,99}", Color::fromHsv(32, 64, 99).toString());
 }
-
-int main(int argc, char** argv)
-{
-  ::testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
-}

src/file/file_unittest.cpp

@@ -16,9 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <gtest/gtest.h>
+#include "tests/test.h"
-
-#include "config.h"
 
 #include "app.h"
 #include "document.h"

src/main.cpp

@@ -71,8 +71,8 @@ static bool get_memory_dump_filename(std::string& filename)
 #endif
 }
 
-// ASEPRITE entry point
+// ASEPRITE entry point. (Called from she library.)
-int main(int argc, char* argv[])
+int app_main(int argc, char* argv[])
 {
   // Initialize the random seed.
   std::srand(static_cast<unsigned int>(std::time(NULL)));

src/she/she_alleg4.cpp

@@ -310,12 +310,11 @@ System* Instance()
 
 }
 
-#ifdef main
+// It must be defined by the user program code.
+extern int app_main(int argc, char* argv[]);
+
 int main(int argc, char* argv[]) {
-#undef main
+  return app_main(argc, argv);
-  extern int main(int argc, char* argv[]);
-  return main(argc, argv);
 }
 
 END_OF_MAIN();
-#endif

src/tests/test.h

@@ -28,11 +28,7 @@
   #include "ui/gui.h"
 #endif
 
-#ifdef main
+int app_main(int argc, char* argv[])
-  #undef main
-#endif
-
-int main(int argc, char* argv[])
 {
   int exitcode;
   ::testing::InitGoogleTest(&argc, argv);