From 70fd65501e5ddc0dab49f732866483c826d6d8e7 Mon Sep 17 00:00:00 2001 From: bkaradzic Date: Sun, 9 Dec 2012 14:51:32 -0800 Subject: [PATCH] Manually integrated @gtbass OSX changes. --- .gitignore | 1 + examples/common/entry_osx.cpp | 17 +++++++++++++++++ makefile | 1 + 3 files changed, 19 insertions(+) create mode 100644 examples/common/entry_osx.cpp diff --git a/.gitignore b/.gitignore index d173afe0a..b1bb97bbe 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ .debug/ .svn/ tags +.DS_Store diff --git a/examples/common/entry_osx.cpp b/examples/common/entry_osx.cpp new file mode 100644 index 000000000..6aaeedbd7 --- /dev/null +++ b/examples/common/entry_osx.cpp @@ -0,0 +1,17 @@ +/* + * Copyright 2011-2012 Branimir Karadzic. All rights reserved. + * License: http://www.opensource.org/licenses/BSD-2-Clause + */ + +#include + +#if BX_PLATFORM_OSX + +extern int _main_(int _argc, char** _argv); + +int main(int _argc, char** _argv) +{ + return _main_(_argc, _argv); +} + +#endif // BX_PLATFORM_OSX diff --git a/makefile b/makefile index b51623747..7e5557521 100644 --- a/makefile +++ b/makefile @@ -11,6 +11,7 @@ all: premake --file=premake/premake4.lua --gcc=mingw gmake premake --file=premake/premake4.lua --gcc=linux gmake premake --file=premake/premake4.lua --gcc=emscripten gmake + premake --file=premake/premake4.lua xcode4 make -s --no-print-directory -C src linux-debug32: