From beb4716bce8763fe72bc27169125ebdade50bf03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Wed, 26 Jun 2013 01:14:26 -0300 Subject: [PATCH] Small fix in the premake4 file. --- premake4.lua | 4 ++-- projects/linux/ee.creator.user | 2 +- src/eepp/graphics/cframebuffer.cpp | 1 - src/eepp/ui/cuicontrol.cpp | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/premake4.lua b/premake4.lua index 0e796f1ff..bd07e0ad6 100644 --- a/premake4.lua +++ b/premake4.lua @@ -261,9 +261,9 @@ function build_link_configuration( package_name, use_ee_icon ) links { get_backend_link_name( "sfml-window" ) } end else - if ( os.is_real("macosx") or os.is_real("windows") ) then + if ( os.is_real("macosx") or os.is_real("windows") or os.is_real("mingw32") ) then if ( os.is_real("windows") ) then - links { "mingw32" } + links { "mingw32" } if ( true == use_ee_icon ) then linkoptions { "../../assets/icon/ee.res" } diff --git a/projects/linux/ee.creator.user b/projects/linux/ee.creator.user index cc4185cd8..e938dd047 100644 --- a/projects/linux/ee.creator.user +++ b/projects/linux/ee.creator.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget diff --git a/src/eepp/graphics/cframebuffer.cpp b/src/eepp/graphics/cframebuffer.cpp index 7435cfb4a..c03c9b0e4 100644 --- a/src/eepp/graphics/cframebuffer.cpp +++ b/src/eepp/graphics/cframebuffer.cpp @@ -1,5 +1,4 @@ #include -#include #include #include #include diff --git a/src/eepp/ui/cuicontrol.cpp b/src/eepp/ui/cuicontrol.cpp index 15871c93e..2c9b969f9 100644 --- a/src/eepp/ui/cuicontrol.cpp +++ b/src/eepp/ui/cuicontrol.cpp @@ -798,7 +798,7 @@ cUIControl * cUIControl::OverFind( const eeVector2f& Point ) { if ( NULL == pOver ) - pOver = const_cast( reinterpret_cast( this ) ); + pOver = this; } }