summaryrefslogtreecommitdiffstats
path: root/src/app/main.cpp
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2013-03-22 18:19:53 +0100
committerPiotr Dziwinski <piotrdz@gmail.com>2013-03-22 19:17:08 +0100
commit4a30800cf16d403a7c25d78388e2822aa396ac86 (patch)
tree772753228bab7b0b4ba47e89580ed86de0ca098f /src/app/main.cpp
parent1406464f0ce0b804298e2ee034bdd8bc7856e0dc (diff)
downloadcolobot-4a30800cf16d403a7c25d78388e2822aa396ac86.tar.gz
colobot-4a30800cf16d403a7c25d78388e2822aa396ac86.tar.bz2
colobot-4a30800cf16d403a7c25d78388e2822aa396ac86.zip
Fixes for compiling on MSYS
* fixed SDL_main() and putenv() issues * disabled desktop subdir for MSYS * disabled building CBot_console for now
Diffstat (limited to 'src/app/main.cpp')
-rw-r--r--src/app/main.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp
index e621065..0622370 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -23,6 +23,7 @@
#include "app/app.h"
#include "app/system.h"
+#include "common/config.h"
#include "common/logger.h"
#include "common/misc.h"
#include "common/restext.h"
@@ -70,7 +71,10 @@ The current layout is the following:
//! Entry point to the program
-int main(int argc, char *argv[])
+extern "C"
+{
+
+int SDL_MAIN_FUNC(int argc, char *argv[])
{
CLogger logger; // Create the logger
@@ -111,3 +115,4 @@ int main(int argc, char *argv[])
return code;
}
+} // extern "C"