浏览代码

Merge pull request #1242 from BeamNG/fix_rpath

Fix Linux rpath.
Luis Anton Rebollo 10 年之前
父节点
当前提交
946e74817e
共有 1 个文件被更改,包括 2 次插入3 次删除
  1. 2 3
      Tools/CMake/torque3d.cmake

+ 2 - 3
Tools/CMake/torque3d.cmake

@@ -29,9 +29,8 @@ if(UNIX)
     #set(CXX_FLAG32 "-m32") #uncomment for build x32 on OSx64
     #set(CXX_FLAG32 "-m32") #uncomment for build x32 on OSx64
     
     
     # default compiler flags
     # 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,'$$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
 	# for asm files
 	SET (CMAKE_ASM_NASM_OBJECT_FORMAT "elf")
 	SET (CMAKE_ASM_NASM_OBJECT_FORMAT "elf")