Bläddra i källkod

WIP: Linux port
- Built executables are now recognized as such on Ubuntu (-no-pie linker flag)
- Fixed incorrect rectangle rendering in draw helper

Marko Pintera 8 år sedan
förälder
incheckning
eab127ef02
2 ändrade filer med 7 tillägg och 3 borttagningar
  1. 1 1
      Source/BansheeEngine/Utility/BsDrawHelper.cpp
  2. 6 2
      Source/CMakeLists.txt

+ 1 - 1
Source/BansheeEngine/Utility/BsDrawHelper.cpp

@@ -901,7 +901,7 @@ namespace bs
 						break;
 					case ShapeType::Rectangle:
 					{
-						Rect3Data rectData = mRect3Data[shapeData.idx];
+						Rect3Data& rectData = mRect3Data[shapeData.idx];
 						ShapeMeshes3D::solidQuad(rectData.area, meshData, curVertexOffset, curIndexOffet);
 
 						transform = &rectData.transform;

+ 6 - 2
Source/CMakeLists.txt

@@ -175,7 +175,9 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 
 	set(CMAKE_SHARED_LINKER_FLAGS_RELEASE -s)
 	set(CMAKE_MODULE_LINKER_FLAGS_RELEASE -s)
-	set(CMAKE_EXE_LINKER_FLAGS_RELEASE -s)
+	set(CMAKE_EXE_LINKER_FLAGS_DEBUG "-s -no-pie")
+	set(CMAKE_EXE_LINKER_FLAGS_OPTIMIZEDDEBUG "-s -no-pie")
+	set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-s -no-pie")
 elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
 	# TODO: Use link-time optimization -flto. Might require non-default linker.
 	set(BS_COMPILER_FLAGS_COMMON "-Wall -fPIC -fno-exceptions -fno-strict-aliasing -fno-rtti -Wl,-rpath=$ORIGIN")
@@ -186,7 +188,9 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
 
 	set(CMAKE_SHARED_LINKER_FLAGS_RELEASE -s)
 	set(CMAKE_MODULE_LINKER_FLAGS_RELEASE -s)
-	set(CMAKE_EXE_LINKER_FLAGS_RELEASE -s)
+	set(CMAKE_EXE_LINKER_FLAGS_DEBUG "-s -no-pie")
+	set(CMAKE_EXE_LINKER_FLAGS_OPTIMIZEDDEBUG "-s -no-pie")
+	set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-s -no-pie")
 else()
 # TODO_OTHER_COMPILERS_GO_HERE
 endif()