Make Windows build copy DLLs to output directory

CMakeLists.txt

@@ -65,4 +65,18 @@ target_include_directories(${EXECUTABLE_TARGET}
 target_link_libraries(${EXECUTABLE_TARGET} ${STATIC_LIBS} ${SHARED_LIBS})
 
 # Install executable
-install(TARGETS ${EXECUTABLE_TARGET} DESTINATION bin)
+if(PACKAGE_PLATFORM MATCHES "linux")
+	install(TARGETS ${EXECUTABLE_TARGET} DESTINATION bin)
+elseif(PACKAGE_PLATFORM MATCHES "win")
+	# Install executable
+	install(TARGETS ${EXECUTABLE_TARGET} DESTINATION .)
+	
+	# Install OpenAL DLL
+	if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+		get_target_property(OPENAL_DLL OpenAL::OpenAL IMPORTED_LOCATION_DEBUG)
+	else()
+		get_target_property(OPENAL_DLL OpenAL::OpenAL IMPORTED_LOCATION_RELEASE)
+	endif()
+	
+	install(FILES ${OPENAL_DLL} DESTINATION .)
+endif()

src/game.cpp

@@ -18,7 +18,6 @@
  */
 
 #include "game.hpp"
-#include "game-states.hpp"
 #include "resources/csv-table.hpp"
 #include "states/game-state.hpp"
 #include "states/sandbox-state.hpp"
@@ -1814,7 +1813,7 @@ void Game::setupControls()
 
 	// Setup input mapper
 	inputMapper = new InputMapper(&eventDispatcher);
-	inputMapper->setCallback(std::bind(&Game::mapInput, this, std::placeholders::_1));
+	inputMapper->setCallback(std::bind(&Game::inputMapped, this, std::placeholders::_1));
 	inputMapper->setControl(nullptr);
 	inputMapper->setEnabled(false);
 }
@@ -1870,6 +1869,7 @@ void Game::loadSettings()
 	resetSettings();
 
 	// Load settings table
+	/*
 	try
 	{
 		settingsTable = resourceManager->load<CSVTable>("settings.csv");
@@ -1878,6 +1878,8 @@ void Game::loadSettings()
 	{
 		settingsTable = new CSVTable();
 	}
+	*/
+	settingsTable = new CSVTable();
 
 	// Build settings map
 	for (std::size_t i = 0; i < settingsTable->size(); ++i)
@@ -2759,7 +2761,7 @@ void Game::restringUI()
 
 	// Settings menu strings
 	settingsMenuControlsItem->setName(getString("controls"));
-	settingsMenuControlsItem->setValue(getString("dotdotdot"));
+	settingsMenuControlsItem->setValue(getString("ellipsis"));
 	settingsMenuFullscreenItem->setName(getString("fullscreen"));
 	settingsMenuFullscreenItem->setValue((fullscreen) ? onString : offString);
 	settingsMenuVSyncItem->setName(getString("v-sync"));
@@ -2923,7 +2925,7 @@ void Game::screenshot()
 	glClear(GL_COLOR_BUFFER_BIT);
 }
 
-void Game::mapInput(const InputMapping& mapping)
+void Game::inputMapped(const InputMapping& mapping)
 {
 	// Skip mouse motion events
 	if (mapping.getType() == InputMappingType::MOUSE_MOTION)
@@ -3032,7 +3034,7 @@ void Game::enterTitleState()
 	menuFadeAnimation.rewind();
 	menuFadeAnimation.play();
 
-	// Select the first menu item
+	// Open the main menu and select the first menu item
 	openMenu(mainMenu, 0);
 }
 

src/game.hpp

@@ -173,6 +173,8 @@ private:
 	std::array<std::string, 3> getInputMappingStrings(const InputMapping* mapping);
 	void remapControl(Control* control);
 	void resetControls();
+	// Callback for the input mapper
+	void inputMapped(const InputMapping& mapping);
 
 	void resizeUI(int w, int h);
 	void restringUI();
@@ -184,10 +186,6 @@ private:
 	void queueScreenshot();
 	void screenshot();
 
-
-	// Callback for the input mapper
-	void mapInput(const InputMapping& mapping);
-
 	// State functions
 	void enterSplashState();
 	void exitSplashState();