Last active
January 4, 2016 13:41
-
-
Save spacepluk/f1ae1112acd4494b9ee8 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/build/genie_linux b/build/genie_linux | |
| old mode 100644 | |
| new mode 100755 | |
| diff --git a/build/scripts/Torque6.lua b/build/scripts/Torque6.lua | |
| index a861b97..3eda816 100644 | |
| --- a/build/scripts/Torque6.lua | |
| +++ b/build/scripts/Torque6.lua | |
| @@ -127,7 +127,7 @@ function Torque6() | |
| configuration "linux or bsd" | |
| links { "m" } | |
| linkoptions { "-rdynamic", "-shared" } | |
| - buildoptions { "-fpermissive", "-fPIC" } | |
| + buildoptions { "-std=gnu++11", "-fpermissive", "-fPIC" } | |
| configuration "macosx" | |
| links { "CoreServices.framework" } | |
| diff --git a/src/gui/guiCurveCtrl.cc b/src/gui/guiCurveCtrl.cc | |
| index 1ced283..cc2a02b 100644 | |
| --- a/src/gui/guiCurveCtrl.cc | |
| +++ b/src/gui/guiCurveCtrl.cc | |
| @@ -23,9 +23,9 @@ | |
| #include "console/console.h" | |
| #include "console/consoleTypes.h" | |
| #include "graphics/dgl.h" | |
| -#include <bgfx/bgfx.h> | |
| -#include <bx/fpumath.h> | |
| -#include <imgui/imgui.h> | |
| +//#include <bgfx/bgfx.h> | |
| +//#include <bx/fpumath.h> | |
| +//#include <imgui/imgui.h> | |
| #include "gui/guiCurveCtrl.h" | |
| #include "gui/guiCurveCtrl_Binding.h" | |
| @@ -96,4 +96,4 @@ void GuiCurveCtrl::onRender(Point2I offset, const RectI &updateRect) | |
| } | |
| renderChildControls(offset, updateRect); | |
| -} | |
| \ No newline at end of file | |
| +} | |
| diff --git a/src/platform/types.h b/src/platform/types.h | |
| index 0b83c86..9884838 100644 | |
| --- a/src/platform/types.h | |
| +++ b/src/platform/types.h | |
| @@ -165,7 +165,7 @@ inline U32 endianSwap(const U32 in_swap) | |
| #define OffsetNonConst(x, cls) _Offset_Variant_1(x, cls) | |
| // compiler is GCC 4 | |
| -#elif defined(TORQUE_COMPILER_GCC) && (__GNUC__ == 4) | |
| +#elif defined(TORQUE_COMPILER_GCC) && (__GNUC__ >= 4) | |
| #include <stddef.h> | |
| #define Offset(x, cls) _Offset_Normal(x, cls) | |
| #define OffsetNonConst(x, cls) _Offset_Variant_1(x, cls) | |
| diff --git a/src/platformX86UNIX/platformGL.h b/src/platformX86UNIX/platformGL.h | |
| index 72ce863..43c0ed5 100644 | |
| --- a/src/platformX86UNIX/platformGL.h | |
| +++ b/src/platformX86UNIX/platformGL.h | |
| @@ -38,8 +38,8 @@ extern "C" { | |
| #include "platformX86UNIX/gl_types.h" | |
| #define GL_FUNCTION(fn_return,fn_name,fn_args,fn_value) extern fn_return (*fn_name)fn_args; | |
| -#include "platform/GLCoreFunc.h" | |
| -#include "platform/GLExtFunc.h" | |
| +//#include "platform/GLCoreFunc.h" | |
| +//#include "platform/GLExtFunc.h" | |
| #undef GL_FUNCTION | |
| // GLU functions are linked at compile time, except in the dedicated server build | |
| @@ -48,7 +48,7 @@ extern "C" { | |
| #else | |
| #define GL_FUNCTION(fn_return,fn_name,fn_args,fn_value) extern fn_return (*fn_name)fn_args; | |
| #endif | |
| -#include "platform/GLUFunc.h" | |
| +//#include "platform/GLUFunc.h" | |
| #undef GL_FUNCTION | |
| namespace GLLoader | |
| diff --git a/src/platformX86UNIX/x86UNIXOGLVideo.cc b/src/platformX86UNIX/x86UNIXOGLVideo.cc | |
| index fe68f08..b2701c1 100644 | |
| --- a/src/platformX86UNIX/x86UNIXOGLVideo.cc | |
| +++ b/src/platformX86UNIX/x86UNIXOGLVideo.cc | |
| @@ -33,13 +33,13 @@ | |
| #include "platformX86UNIX/x86UNIXState.h" | |
| #include <bx/timer.h> | |
| -#include <bgfx.h> | |
| -#include <bgfxplatform.h> | |
| +#include <bgfx/bgfx.h> | |
| +#include <bgfx/bgfxplatform.h> | |
| #include <nanovg/nanovg.h> | |
| #include <imgui/imgui.h> | |
| #include "graphics/dgl.h" | |
| #include "graphics/shaders.h" | |
| -#include "3d/rendering/common.h" | |
| +//#include "3d/rendering/common.h" | |
| #include "sysgui/sysgui.h" | |
| #include "plugins/plugins.h" | |
| diff --git a/src/scene/object/object.h b/src/scene/object/object.h | |
| index 101bcff..4cc17cc 100644 | |
| --- a/src/scene/object/object.h | |
| +++ b/src/scene/object/object.h | |
| @@ -28,7 +28,7 @@ | |
| #endif | |
| #ifndef _GAMEOBJECT_H_ | |
| -#include "game/GameObject.h" | |
| +#include "game/gameObject.h" | |
| #endif | |
| #ifndef _ASSET_PTR_H_ | |
| @@ -128,4 +128,4 @@ namespace Scene | |
| }; | |
| } | |
| -#endif | |
| \ No newline at end of file | |
| +#endif |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment