Set up packaging for Windows

lefticus · lefticus · commit e4fdab374a22 · 2015-07-25T21:12:13.000-06:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -208,6 +208,12 @@ include_directories(${SFML_INCLUDE_DIR})
 file(COPY sample_game DESTINATION ${CMAKE_BINARY_DIR})
 
 
-install(TARGETS spiced RUNTIME DESTINATION bin)
+if (CMAKE_HOST_WIN32)
+  install(TARGETS spiced RUNTIME DESTINATION .)
+  install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/sample_game/ DESTINATION .)
+else()
+  install(TARGETS spiced RUNTIME DESTINATION bin)
+endif()
+
 
 
diff --git a/sample_game/spiced.chai b/sample_game/spiced.chai
@@ -628,7 +628,7 @@ var game_creator = fun(game) {
         t_game.show_message_box("Your choices have consequences.\nYou may want to play multiple times.");
         t_game.show_message_box("To interact with characters and objects simply bump into them.\nAll input is via the arrow keys and enter key.");
         t_game.show_message_box("Unfortunately we ran out of time for graphics.\nOur NPCs are pinheads.\n\nOur PC is a marble.\n\nOur modern world is a medieval fantasy world.");
-        t_game.show_message_box("You have ${money} to start with.\nUse it wisely.");
+        t_game.show_message_box("You have $${money} to start with.\nUse it wisely.");
         t_game.add_queued_action(
           fun(t_game_time, t_simulation_time, t_game) {
             t_game.enter_map("glennhaven");
diff --git a/src/game.cpp b/src/game.cpp
@@ -173,7 +173,7 @@ void Game::update(const float t_game_time, const float t_simulation_time)
   if (m_map != m_maps.end())
   {
     auto &map = m_map->second;
-    auto distance = Game::get_input_direction_vector() * 20.0f * simulation_time;
+    auto distance = Game::get_input_direction_vector() * 40.0f * simulation_time;
     for (auto &collision : map.get_collisions(m_avatar, distance))
     {
       collision.get().do_collision(t_game_time, simulation_time, *this, m_avatar);

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ void Game::update(const float t_game_time, const float t_simulation_time)`
`173`	`173`	`if (m_map != m_maps.end())`
`174`	`174`	`{`
`175`	`175`	`auto &map = m_map->second;`
`176`		`- auto distance = Game::get_input_direction_vector() * 20.0f * simulation_time;`
	`176`	`+ auto distance = Game::get_input_direction_vector() * 40.0f * simulation_time;`
`177`	`177`	`for (auto &collision : map.get_collisions(m_avatar, distance))`
`178`	`178`	`{`
`179`	`179`	`collision.get().do_collision(t_game_time, simulation_time, *this, m_avatar);`