Remove strings.h wrapper

c++11
scrawl 10 years ago
parent c843cfc8e2
commit fe15f31f3e

@ -194,7 +194,7 @@ find_package(SDL2 REQUIRED)
find_package(OpenAL REQUIRED) find_package(OpenAL REQUIRED)
find_package(Bullet REQUIRED) find_package(Bullet REQUIRED)
include_directories("." ${LIBS_DIR} include_directories("."
SYSTEM SYSTEM
${OGRE_INCLUDE_DIR} ${OGRE_INCLUDE_DIR}/Ogre ${OGRE_INCLUDE_DIR}/OGRE ${OGRE_INCLUDE_DIRS} ${OGRE_INCLUDE_DIR} ${OGRE_INCLUDE_DIR}/Ogre ${OGRE_INCLUDE_DIR}/OGRE ${OGRE_INCLUDE_DIRS}
${SDL2_INCLUDE_DIR} ${SDL2_INCLUDE_DIR}

@ -1,4 +1,5 @@
#include <iostream> #include <iostream>
#include <iomanip>
#include <vector> #include <vector>
#include <exception> #include <exception>

@ -25,12 +25,11 @@
#define BSA_BSA_FILE_H #define BSA_BSA_FILE_H
#include <stdint.h> #include <stdint.h>
#include <libs/platform/strings.h>
#include <string> #include <string>
#include <vector> #include <vector>
#include <map> #include <map>
#include <OgreDataStream.h> #include <components/misc/stringops.hpp>
#include <components/files/constrainedfilestream.hpp> #include <components/files/constrainedfilestream.hpp>
@ -74,7 +73,7 @@ private:
struct iltstr struct iltstr
{ {
bool operator()(const char *s1, const char *s2) const bool operator()(const char *s1, const char *s2) const
{ return strcasecmp(s1,s2) < 0; } { return Misc::StringUtils::ciLess(s1, s2); }
}; };
/** A map used for fast file name lookup. The value is the index into /** A map used for fast file name lookup. The value is the index into

@ -1,5 +1,8 @@
#include "registerarchives.hpp" #include "registerarchives.hpp"
#include <iostream>
#include <sstream>
#include <components/vfs/manager.hpp> #include <components/vfs/manager.hpp>
#include <components/vfs/bsaarchive.hpp> #include <components/vfs/bsaarchive.hpp>
#include <components/vfs/filesystemarchive.hpp> #include <components/vfs/filesystemarchive.hpp>

@ -1,18 +0,0 @@
// Wrapper for MSVC/GCC
#ifndef _STRINGS_WRAPPER_H
#define _STRINGS_WRAPPER_H
// For GCC, just use strings.h (this applies to mingw too)
#if defined(__GNUC__)
# include <strings.h>
#elif defined(MSVC) || defined(_MSC_VER)
# pragma warning(disable: 4996)
# define strcasecmp stricmp
# define snprintf _snprintf
#else
# warning "Unable to determine your compiler, you should probably take a look here."
# include <strings.h> // Just take a guess
#endif
#endif /* _STRINGS_WRAPPER_H */
Loading…
Cancel
Save