version 31.0, fix windows compiling, remove Makefile

jacob1 · May 23, 2015 · 6df0352 · 6df0352
1 parent 36489b8
commit 6df0352
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 264 deletions.
diff --git a/Makefile b/Makefile
diff --git a/build/.empty b/build/.empty
diff --git a/build/obj/.empty b/build/obj/.empty
diff --git a/build/obj/game/.empty b/build/obj/game/.empty
diff --git a/build/obj/multiplayer/.empty b/build/obj/multiplayer/.empty
diff --git a/build/obj/simulation/.empty b/build/obj/simulation/.empty
diff --git a/build/obj/simulation/elements/.empty b/build/obj/simulation/elements/.empty
diff --git a/build/obj/socket/.empty b/build/obj/socket/.empty
diff --git a/includes/defines.h b/includes/defines.h
@@ -29,12 +29,12 @@
 #define BUILD_NUM 322
 //VersionInfoEnd
 
-#define MOD_VERSION 30
-#define MOD_MINOR_VERSION 4
+#define MOD_VERSION 31
+#define MOD_MINOR_VERSION 0
 #define MOD_SAVE_VERSION 21 //This is not the version number of my mod anymore, it's only changed when I change the saving code
-#define MOD_BUILD_VERSION 54 //For update checks
-#define BETA_VERSION 90
-#define BETA_MINOR_VER 1
+#define MOD_BUILD_VERSION 55 //For update checks
+#define BETA_VERSION 91
+#define BETA_MINOR_VER 0
 #define RELEASE_VERSION 90
 #define RELEASE_MINOR_VER 2
 

diff --git a/src/interface/Engine.cpp b/src/interface/Engine.cpp
@@ -1,4 +1,10 @@
 #include <SDL/SDL.h>
+#ifdef WIN
+#include <windows.h>
+//#include <Shellapi.h>
+#include "game/Menus.h"
+#include "update.h"
+#endif
 #include "Engine.h"
 #include "interface.h"
 #include "misc.h"