summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authormanzerbredes <loic.guegan_secondary@yahoo.fr>2015-05-05 16:30:46 +0200
committermanzerbredes <loic.guegan_secondary@yahoo.fr>2015-05-05 16:30:46 +0200
commit1220e2d70f40139bed69602041ba373297103573 (patch)
tree49a2443cdacee9c35abfa005a5d703ba7efa6e23 /src/main.cpp
parentf7610d669bcf3986827a905fc4bc03946be0b0c6 (diff)
Add loadable skin and correct some things
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 165c067..92cee05 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -13,7 +13,6 @@
-
//----- Start -----
int main()
{
@@ -21,10 +20,13 @@ int main()
srand(time(NULL));
//Init controller
+#if defined(CONSOLECONTROLLER)
+ ConsoleController controller;
+#elif defined(SFMLCONTROLLER)
SFMLController controller;
-
- //ConsoleController controller;
-
+#else
+#error Please defined which controller to use in CMakeList.txt
+#endif
//Run the game
controller.run();