remove our stdint.h version that uses boost and force usage of system stdint.h

CMakeLists.txt

@@ -238,6 +238,14 @@ if (UNIX AND NOT APPLE)
     find_package (Threads)
 endif()
 
+# Look for stdint.h
+include(CheckIncludeFile)
+check_include_file(stdint.h HAVE_STDINT_H)
+if(NOT HAVE_STDINT_H)
+    unset(HAVE_STDINT_H CACHE)
+    message(FATAL_ERROR "stdint.h was not found" )
+endif()
+
 include (CheckIncludeFileCXX)
 check_include_file_cxx(unordered_map HAVE_UNORDERED_MAP)
 if (HAVE_UNORDERED_MAP)

apps/openmw/mwbase/dialoguemanager.hpp

@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include <libs/platform/stdint.h>
+#include <stdint.h>
 
 namespace ESM
 {

apps/openmw/mwbase/journal.hpp

@@ -5,7 +5,7 @@
 #include <deque>
 #include <map>
 
-#include <libs/platform/stdint.h>
+#include <stdint.h>
 
 #include "../mwdialogue/journalentry.hpp"
 #include "../mwdialogue/topic.hpp"

apps/openmw/mwgui/bookpage.cpp

@@ -6,7 +6,7 @@
 #include "MyGUI_TextureUtility.h"
 #include "MyGUI_FactoryManager.h"
 
-#include <platform/stdint.h>
+#include <stdint.h>
 #include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/make_shared.hpp>

apps/openmw/mwgui/bookpage.hpp

@@ -5,7 +5,7 @@
 #include "MyGUI_Widget.h"
 
 #include <functional>
-#include <platform/stdint.h>
+#include <stdint.h>
 #include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>
 

apps/openmw/mwgui/journalviewmodel.hpp

@@ -4,7 +4,7 @@
 #include <string>
 #include <memory>
 #include <functional>
-#include <platform/stdint.h>
+#include <stdint.h>
 #include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>
 

apps/openmw/mwgui/mapwindow.hpp

@@ -1,7 +1,7 @@
 #ifndef MWGUI_MAPWINDOW_H
 #define MWGUI_MAPWINDOW_H
 
-#include <libs/platform/stdint.h>
+#include <stdint.h>
 
 #include "windowpinnablebase.hpp"
 

apps/openmw/mwscript/globalscripts.hpp

@@ -4,7 +4,7 @@
 #include <string>
 #include <map>
 
-#include <libs/platform/stdint.h>
+#include <stdint.h>
 
 #include "locals.hpp"
 

apps/openmw/mwsound/openal_output.cpp

@@ -3,6 +3,8 @@
 #include <iostream>
 #include <vector>
 
+#include <stdint.h>
+
 #include <boost/thread.hpp>
 
 #include "openal_output.hpp"

apps/openmw/mwworld/globals.hpp

@@ -5,7 +5,7 @@
 #include <string>
 #include <map>
 
-#include <libs/platform/stdint.h>
+#include <stdint.h>
 
 #include <components/interpreter/types.hpp>
 #include <components/esm/variant.hpp>

components/bsa/bsa_file.hpp

@@ -24,7 +24,7 @@
 #ifndef BSA_BSA_FILE_H
 #define BSA_BSA_FILE_H
 
-#include <libs/platform/stdint.h>
+#include <stdint.h>
 #include <libs/platform/strings.h>
 #include <string>
 #include <vector>

components/esm/defs.hpp

@@ -1,7 +1,7 @@
 #ifndef OPENMW_ESM_DEFS_H
 #define OPENMW_ESM_DEFS_H
 
-#include <libs/platform/stdint.h>
+#include <stdint.h>
 
 namespace ESM
 {

components/esm/esmcommon.hpp

@@ -4,7 +4,7 @@
 #include <string>
 #include <cstring>
 
-#include <libs/platform/stdint.h>
+#include <stdint.h>
 #include <libs/platform/string.h>
 
 namespace ESM

components/esm/esmreader.hpp

@@ -1,7 +1,7 @@
 #ifndef OPENMW_ESM_READER_H
 #define OPENMW_ESM_READER_H
 
-#include <libs/platform/stdint.h>
+#include <stdint.h>
 #include <libs/platform/string.h>
 #include <cassert>
 #include <vector>

components/esm/loadland.hpp

@@ -1,7 +1,7 @@
 #ifndef OPENMW_ESM_LAND_H
 #define OPENMW_ESM_LAND_H
 
-#include <libs/platform/stdint.h>
+#include <stdint.h>
 
 #include "esmcommon.hpp"
 

components/files/constrainedfiledatastream.cpp

@@ -4,7 +4,7 @@
 #include <stdexcept>
 #include <cassert>
 
-#include <libs/platform/stdint.h>
+#include <stdint.h>
 
 namespace {
 

components/nif/niffile.hpp

@@ -42,7 +42,7 @@
 #include <boost/make_shared.hpp>
 #include <boost/detail/endian.hpp>
 
-#include <libs/platform/stdint.h>
+#include <stdint.h>
 
 #include "record.hpp"
 #include "niftypes.hpp"

extern/shiny/Main/Preprocessor.hpp

@@ -1,6 +1,8 @@
 #ifndef SH_PREPROCESSOR_H
 #define SH_PREPROCESSOR_H
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 

libs/platform/stdint.h

@@ -1,21 +0,0 @@
-// Wrapper for MSVC
-#ifndef _STDINT_WRAPPER_H
-#define _STDINT_WRAPPER_H
-
-#if (_MSC_VER >= 1600)
-
-#include <cstdint>
-
-#else
-
-#include <boost/cstdint.hpp>
-
-// Pull the boost names into the global namespace for convenience
-using boost::int32_t;
-using boost::uint32_t;
-using boost::int64_t;
-using boost::uint64_t;
-
-#endif
-
-#endif