From 9e2129c4b3b68947b9b0727bc2650bbc1155e3e6 Mon Sep 17 00:00:00 2001 From: athile Date: Mon, 30 Aug 2010 10:34:13 +0100 Subject: [PATCH] WIP Windows build --- apps/openmw/CMakeLists.txt | 2 +- extern/mygui_3.0.1/OgrePlatform/CMakeLists.txt | 4 ++-- libs/mangle | 2 +- libs/platform/stdint.h | 8 ++++++++ 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt index b5948aaea..c3ba0b22b 100644 --- a/apps/openmw/CMakeLists.txt +++ b/apps/openmw/CMakeLists.txt @@ -201,7 +201,7 @@ target_link_libraries(openmw ${SOUND_INPUT_LIBRARY} caelum MyGUIEngine - MyGUI.OgrePlatform + MyGUIOgrePlatform ) if (APPLE) diff --git a/extern/mygui_3.0.1/OgrePlatform/CMakeLists.txt b/extern/mygui_3.0.1/OgrePlatform/CMakeLists.txt index 38c5c714a..2fa38a242 100644 --- a/extern/mygui_3.0.1/OgrePlatform/CMakeLists.txt +++ b/extern/mygui_3.0.1/OgrePlatform/CMakeLists.txt @@ -4,6 +4,6 @@ include_directories( ${OGRE_INCLUDE_DIR} ) include(MyGUI.OgrePlatform.list) -add_library(MyGUI.OgrePlatform ${HEADER_FILES} ${SOURCE_FILES}) -target_link_libraries(MyGUI.OgrePlatform ${OGRE_LIBRARIES}) +add_library(MyGUIOgrePlatform ${HEADER_FILES} ${SOURCE_FILES}) +target_link_libraries(MyGUIOgrePlatform ${OGRE_LIBRARIES}) link_directories(${OGRE_LIB_DIR}) diff --git a/libs/mangle b/libs/mangle index 6ff6d7556..4a31f4e0f 160000 --- a/libs/mangle +++ b/libs/mangle @@ -1 +1 @@ -Subproject commit 6ff6d7556c760bfb784249b63c5610e53f891a9e +Subproject commit 4a31f4e0f874b6e0715b7c195a44f5a3975fdb7e diff --git a/libs/platform/stdint.h b/libs/platform/stdint.h index 499590da7..00af741b1 100644 --- a/libs/platform/stdint.h +++ b/libs/platform/stdint.h @@ -2,6 +2,12 @@ #ifndef _STDINT_WRAPPER_H #define _STDINT_WRAPPER_H +#if (_MSC_VER >= 1600) + +#include + +#else + #include // Pull the boost names into the global namespace for convenience @@ -11,3 +17,5 @@ using boost::int64_t; using boost::uint64_t; #endif + +#endif