windows fixes broke linux build

also disable magic resistance in shipspell tests

CMakeLists.txt

@@ -7,6 +7,10 @@ endif(WIN32)
 
 project (eressea-server C)
 set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+if (WIN32)
+# make subdirectories build to the same output folders (DLLs):
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
+endif (WIN32)
 
 if (MSVC)
 find_package (PDCurses)
@@ -56,7 +60,6 @@ endif(TOLUA_FOUND)
 
 enable_testing()
 
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
 add_subdirectory (tolua)
 add_subdirectory (tools)
 add_subdirectory (storage)

scripts/tests/e2/e2features.lua

@@ -15,6 +15,7 @@ function setup()
     eressea.settings.set("rules.encounters", "0")
     eressea.settings.set("study.produceexp", "0")
     eressea.settings.set("rules.peasants.growth.factor", "0")
+    eressea.settings.set("magic.resist.enable", "0")
 end
 
 function disabled_double_default()