Windows fixes

CMakeLists.txt

@@ -12,25 +12,26 @@ cmake_minimum_required(VERSION 2.6)
 #
 # Pre-built binaries being used?
 #
-IF(EXISTS "${CMAKE_SOURCE_DIR}/prebuilt/ogre_1_7_1")
-    message (STATUS "OpenMW pre-built binaries found.  Attempting to use pre-built binaries.")
+IF(EXISTS "${CMAKE_SOURCE_DIR}/prebuilt/vc100-mt-gd/ogre_1_7_1")
+    set(PREBUILT_DIR "${CMAKE_SOURCE_DIR}/prebuilt/vc100-mt-gd")
+    message (STATUS "OpenMW pre-built binaries found at ${PREBUILT_DIR}.")
     
-    SET(ENV{OGRE_HOME} "${CMAKE_SOURCE_DIR}/prebuilt/ogre_1_7_1")
+    SET(ENV{OGRE_HOME} "${PREBUILT_DIR}/ogre_1_7_1")
     
-    SET(ENV{BOOST_ROOT} "${CMAKE_SOURCE_DIR}/prebuilt/boost_1_42_0")
+    SET(ENV{BOOST_ROOT} "${PREBUILT_DIR}/boost_1_42_0")
     set(Boost_USE_STATIC_LIBS   ON)
     set(Boost_USE_MULTITHREADED ON)
     set(ENV{BOOST_INCLUDEDIR} "${BOOST_ROOT}/include")
     set(ENV{BOOST_LIBRARYDIR} "${BOOST_ROOT}/lib")
     
-    set(ENV{FREETYPE_DIR} "${CMAKE_SOURCE_DIR}/prebuilt/freetype-2.3.5-1")
+    set(ENV{FREETYPE_DIR} "${PREBUILT_DIR}/freetype-2.3.5-1")
     
     set(USE_MPG123 OFF)
     set(USE_AUDIERE ON)    
-    set(AUDIERE_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/prebuilt/audiere-1.9.4/include")
-    set(AUDIERE_LIBRARY "${CMAKE_SOURCE_DIR}/prebuilt/audiere-1.9.4/lib/audiere.lib")
+    set(AUDIERE_INCLUDE_DIR "${PREBUILT_DIR}/audiere-1.9.4/include")
+    set(AUDIERE_LIBRARY "${PREBUILT_DIR}/audiere-1.9.4/lib/audiere.lib")
     
-    set(ENV{OPENALDIR} "${CMAKE_SOURCE_DIR}/prebuilt/OpenAL 1.1 SDK")
+    set(ENV{OPENALDIR} "${PREBUILT_DIR}/OpenAL 1.1 SDK")
     
 ELSE()
     message (STATUS "OpenMW pre-built binaries not found.  Using standard locations.")

apps/openmw/mwgui/window_manager.cpp

@@ -13,8 +13,8 @@ WindowManager::WindowManager(MyGUI::Gui *_gui, MWWorld::Environment& environment
 {
   // Get size info from the Gui object
   assert(gui);
-  int w = gui->getViewWidth();
-  int h = gui->getViewHeight();
+  int w = gui->getViewSize().width;
+  int h = gui->getViewSize().height;
 
   hud = new HUD(w,h);
   menu = new MainMenu(w,h);

libs/mangle

@@ -1 +1 @@
-Subproject commit 4a31f4e0f874b6e0715b7c195a44f5a3975fdb7e
+Subproject commit 2407f21c47abe218b9347df0fc9e8e9aebc02e3f

libs/openengine

@@ -1 +1 @@
-Subproject commit 2e2f8e9725fd1a27a82d0ad5c6c0e296e715eb60
+Subproject commit 85cb75631b1efbde312e65937ad059754fb835b6