From 5315f5694dc9684827526b53ea5bdd601e07f04f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Date: Sat, 26 Mar 2011 23:32:47 +0100 Subject: [PATCH] Fixed USE_ definitions --- CMakeLists.txt | 2 +- src/include/myendian.h | 6 +++--- src/stratagus/stratagus.cpp | 22 ++++++++++++++++++---- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 604791293..daac8f1f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -412,7 +412,7 @@ if(APPLE) endif() if(BSD) - add_definitions(-DBSD) + add_definitions(-DUSE_BSD) endif() if(BEOS) diff --git a/src/include/myendian.h b/src/include/myendian.h index 2adb5215b..a77d8ccd8 100644 --- a/src/include/myendian.h +++ b/src/include/myendian.h @@ -10,7 +10,7 @@ // /**@name myendian.h - The endian-specific headerfile. */ // -// (c) Copyright 2000-2004 by Lutz Sammer +// (c) Copyright 2000-2011 by Lutz Sammer and Pali Rohár // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -142,11 +142,11 @@ extern unsigned inline _FetchLE32(unsigned char **pp) { ----------------------------------------------------------------------------*/ #if !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(_MSC_VER) -#if defined(BSD) +#if defined(USE_BSD) #include #else #include -#endif // BSD +#endif // USE_BSD #if defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN #include diff --git a/src/stratagus/stratagus.cpp b/src/stratagus/stratagus.cpp index d9b0bf911..a4f54b705 100644 --- a/src/stratagus/stratagus.cpp +++ b/src/stratagus/stratagus.cpp @@ -782,14 +782,28 @@ int main(int argc, char **argv) #ifdef USE_MNG "MNG " #endif -#ifdef USE_MAEMO - "MAEMO " +#ifdef USE_OPENGL + "OPENGL " #endif #ifdef USE_GLES "GLES " #endif - "" - ; +#ifdef USE_WIN32 + "WIN32 " +#endif +#ifdef USE_BSD + "BSD " +#endif +#ifdef USE_BEOS + "BEOS " +#endif +#ifdef USE_MAC + "MAC " +#endif +#ifdef USE_MAEMO + "MAEMO " +#endif + ""; #ifdef USE_BEOS //