Fixed Windows build.

.gitmodules

@@ -15,7 +15,7 @@
 	ignore = dirty
 [submodule "external/lua"]
 	path = external/lua
-	url = https://github.com/WohlSoft/LuaJIT
+	url = https://github.com/Unarelith/LuaJIT
 	ignore = dirty
 [submodule "external/SFML"]
 	path = external/SFML

.travis.yml

@@ -20,7 +20,6 @@ addons:
             - libgl1-mesa-dev
             - libegl1-mesa-dev
             - libgles2-mesa-dev
-            - libxi-dev
             - g++-8
             - cmake
             - cxxtest

CMakeLists.txt

@@ -15,7 +15,7 @@ endif ()
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
-option(OM_BUILD_TESTS ON "Enable building tests if CxxTest is available")
+set(OM_BUILD_TESTS ON CACHE BOOL "Enable building tests if CxxTest is available")
 
 include_directories(external)
 

external/gamekit

@@ -1 +1 @@
-Subproject commit 3958598977aed6eac93edc9312f48b2a398bd1c3
+Subproject commit 9c5f479cc2013aec93ae852bc4a90545d24859ab

external/lua

@@ -1 +1 @@
-Subproject commit d970966a7e575bd2b660009148f4d861ed0ddd2c
+Subproject commit 59f7300570ad8042c4077b9a96dc03e0e1dc70d7

misc/deploy.sh

@@ -10,6 +10,7 @@ rm -f deploy/*.zip
 
 # Win32
 i686-w64-mingw32-cmake -B deploy/win32 . && \
+cp /usr/i686-w64-mingw32/bin/libssp-0.dll deploy/win32 && \
 cmake --build deploy/win32 -j8 && \
 i686-w64-mingw32-strip deploy/win32/openminer.exe deploy/win32/openminer_server.exe && \
 cp deploy/win32/openminer.exe deploy/win32/openminer_server.exe deploy/win32/bin/openminer && \
@@ -23,10 +24,11 @@ cp deploy/win32/libjpeg.dll deploy/win32/bin/openminer && \
 cp deploy/win32/libpng16.dll deploy/win32/bin/openminer && \
 cd deploy/win32/bin && \
 zip -T -r ../../OpenMiner-$version-win32.zip openminer &&
-cd ../../..
+cd ../../.. && \
 
 # Win64
 x86_64-w64-mingw32-cmake -B deploy/win64 . && \
+cp /usr/x86_64-w64-mingw32/bin/libssp-0.dll deploy/win64 && \
 cmake --build deploy/win64 -j8 && \
 x86_64-w64-mingw32-strip deploy/win64/openminer.exe deploy/win64/openminer_server.exe && \
 cp deploy/win64/openminer.exe deploy/win64/openminer_server.exe deploy/win64/bin/openminer && \
@@ -40,7 +42,7 @@ cp deploy/win64/libjpeg.dll deploy/win64/bin/openminer && \
 cp deploy/win64/libpng16.dll deploy/win64/bin/openminer && \
 cd deploy/win64/bin && \
 zip -T -r ../../OpenMiner-$version-win64.zip openminer &&
-cd ../../..
+cd ../../.. && \
 
 # Linux64
 cmake -B deploy/linux64 . && \
@@ -76,7 +78,7 @@ echo -e "#!/bin/bash\n./lib/ld-linux-x86-64.so.2 --library-path lib ./bin/openmi
 chmod +x deploy/linux64/bin/openminer/openminer deploy/linux64/bin/openminer/openminer_server && \
 cd deploy/linux64/bin && \
 zip -T -r ../../OpenMiner-$version-linux64.zip openminer && \
-cd ../../..
+cd ../../.. && \
 
 # Mods and texture packs
 cd mods && \

source/client/core/ClientApplication.cpp

@@ -108,7 +108,6 @@ void ClientApplication::init() {
 
 	createWindow(Config::screenWidth, Config::screenHeight, APP_NAME);
 	m_window.setVerticalSyncEnabled(Config::isVerticalSyncEnabled);
-	m_window.setOpenGLFlagsSetupFunc(&ClientApplication::initOpenGL);
 	m_window.disableView();
 
 	m_resourceHandler.loadConfigFile<TextureLoader>("resources/config/textures.xml");

source/client/states/TitleScreenState.cpp

@@ -107,9 +107,6 @@ void TitleScreenState::onEvent(const SDL_Event &event) {
 	}
 }
 
-void TitleScreenState::update() {
-}
-
 void TitleScreenState::startSingleplayer(bool showLoadingState, const std::string &worldName) {
 	GameConfig::worldName = worldName;
 

source/client/states/TitleScreenState.hpp

@@ -44,8 +44,6 @@ class TitleScreenState : public InterfaceState {
 
 		void onEvent(const SDL_Event &event) override;
 
-		void update() override;
-
 		void startSingleplayer(bool showLoadingState, const std::string &worldName = "");
 		void startMultiplayer(const std::string &host);