From 265d1a540a0bdd1903cdcfa37d7d4a91f2117cdb Mon Sep 17 00:00:00 2001 From: LuisAntonRebollo Date: Sat, 7 Mar 2015 22:18:53 +0100 Subject: [PATCH 1/2] Fix Linux rpath. --- Tools/CMake/torque3d.cmake | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Tools/CMake/torque3d.cmake b/Tools/CMake/torque3d.cmake index 73d732fb5..472ad07e9 100644 --- a/Tools/CMake/torque3d.cmake +++ b/Tools/CMake/torque3d.cmake @@ -29,9 +29,8 @@ if(UNIX) #set(CXX_FLAG32 "-m32") #uncomment for build x32 on OSx64 # default compiler flags - # force compile 32 bit - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_FLAG32} -Wall -Wundef -msse -pipe -Wfatal-errors ${TORQUE_ADDITIONAL_LINKER_FLAGS}") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CXX_FLAG32} -Wall -Wundef -msse -pipe -Wfatal-errors ${TORQUE_ADDITIONAL_LINKER_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_FLAG32} -Wall -Wundef -msse -pipe -Wfatal-errors ${TORQUE_ADDITIONAL_LINKER_FLAGS} -Wl,-rpath=.") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CXX_FLAG32} -Wall -Wundef -msse -pipe -Wfatal-errors ${TORQUE_ADDITIONAL_LINKER_FLAGS} -Wl,-rpath=.") # for asm files SET (CMAKE_ASM_NASM_OBJECT_FORMAT "elf") From 30bf15f4eeb89fa131d9d30fce6314e5852a6651 Mon Sep 17 00:00:00 2001 From: LuisAntonRebollo Date: Sat, 7 Mar 2015 23:13:57 +0100 Subject: [PATCH 2/2] Fix Linux rpath. Changed to use $ORIGIN. --- Tools/CMake/torque3d.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tools/CMake/torque3d.cmake b/Tools/CMake/torque3d.cmake index 472ad07e9..1dce72d21 100644 --- a/Tools/CMake/torque3d.cmake +++ b/Tools/CMake/torque3d.cmake @@ -29,8 +29,8 @@ if(UNIX) #set(CXX_FLAG32 "-m32") #uncomment for build x32 on OSx64 # default compiler flags - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_FLAG32} -Wall -Wundef -msse -pipe -Wfatal-errors ${TORQUE_ADDITIONAL_LINKER_FLAGS} -Wl,-rpath=.") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CXX_FLAG32} -Wall -Wundef -msse -pipe -Wfatal-errors ${TORQUE_ADDITIONAL_LINKER_FLAGS} -Wl,-rpath=.") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_FLAG32} -Wall -Wundef -msse -pipe -Wfatal-errors ${TORQUE_ADDITIONAL_LINKER_FLAGS} -Wl,-rpath,'$$ORIGIN'") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CXX_FLAG32} -Wall -Wundef -msse -pipe -Wfatal-errors ${TORQUE_ADDITIONAL_LINKER_FLAGS} -Wl,-rpath,'$$ORIGIN'") # for asm files SET (CMAKE_ASM_NASM_OBJECT_FORMAT "elf")