Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- a/Omnibot/Common/common.h
- +++ b/Omnibot/Common/common.h
- @@ -332,10 +332,10 @@ enum MoveMode
- #include "Utilities.h"
- -// cs: FIXME: debug version of OBASSERT doesnt build in linux. doesn't like __VA_ARGS__
- -#ifdef __linux__
- +// FIXME: debug version of OBASSERT doesn't build on linux and Mac. doesn't like __VA_ARGS__
- +#if defined(__linux__) || defined(__APPLE__)
- #define OBASSERT(f, sz, ...) {} // cs: for gcc warnings, was (f)
- -#else // !__linux__
- +#else // !__linux__, !__APPLE__
- #ifdef _DEBUG
- #define OBASSERT(f, msg, ...) { static bool bShowAssert = true; \
- if(bShowAssert) { \
- --- a/Omnibot/Jamfile
- +++ b/Omnibot/Jamfile
- @@ -22,10 +22,10 @@ project Omnibot
- <include>dependencies/gmsrc_ex/src/3rdParty/gmbinder2
- <toolset>msvc:<include>dependencies/gmsrc_ex/src/platform/win32msvc
- <toolset>gcc:<include>dependencies/gmsrc_ex/src/platform/win32gcc
- - <toolset>darwin:<include>dependencies/gmsrc_ex/src/platform/osx
- + <toolset>darwin:<include>dependencies/gmsrc_ex/src/platform/win32gcc
- <toolset>msvc:<define>WIN32
- <toolset>gcc:<define>__linux__
- - <toolset>darwin:<define>__osx__
- + <toolset>darwin:<cxxflags>-w
- <variant>debug:<define>_DEBUG
- <variant>release:<define>NDEBUG
- ;
- deleted file mode 100644
- --- a/Omnibot/dependencies/gmsrc_ex/src/platform/osx/gmConfig_p.h
- --- a/Omnibot/dependencies/gmsrc_ex/src/platform/win32gcc/gmConfig_p.h
- +++ b/Omnibot/dependencies/gmsrc_ex/src/platform/win32gcc/gmConfig_p.h
- @@ -12,7 +12,9 @@
- #ifndef _GMCONFIG_P_H_
- #define _GMCONFIG_P_H_
- -#include <malloc.h> // alloca
- +#ifndef __APPLE__
- +# include <malloc.h> // alloca
- +#endif
- #include <new>
- #include <cassert>
- @@ -20,10 +22,9 @@
- // pragmas
- -
- // system defines
- -#if defined(__linux__)
- +#if defined(__linux__) || defined(__APPLE__)
- #define GM_LITTLE_ENDIAN 1
- #define GM_COMPILER_GCC
- #if defined(__LP64__) // 64bit target
- @@ -33,7 +34,6 @@
- #define GM_DEFAULT_ALLOC_ALIGNMENT 4
- #define GM_PTR_SIZE_32 // Ptr size is 32bit
- #endif
- -// #define GM_X86
- #endif //__linux__
- #define GM_CDECL
Advertisement
Add Comment
Please, Sign In to add comment