ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmake: 

* set CMAKE_POSITION_INDEPENDENT_CODE variable for future cmake policy (which need to be upgraded to remove some warnings)
* On multiarch system, force the search on 32bits library (/usr/lib/i386-linux-gnu). Change previous compilation behavior on 64 bits system
    - Before: cmake search lib in 64 bits dir (64 bits lib needed to be install) but the linker got the 32 bits lib under the hood.
    + now: cmake search lib in 32 bits dir (only 32 bits lib need to be install). The linker still get 32 bits lib. In others word, you need to install -dev:i386 package on debian/ubuntu system



git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5367 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut 2012-08-12 07:26:39 +00:00
parent 20958dede3
commit 68a833f4e7
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -37,6 +37,18 @@ if(CMAKE_SIZEOF_VOID_P MATCHES "8")
SET_PROPERTY(GLOBAL PROPERTY COMPILE_DEFINITIONS "-m32") SET_PROPERTY(GLOBAL PROPERTY COMPILE_DEFINITIONS "-m32")
endif(CMAKE_SIZEOF_VOID_P MATCHES "8") endif(CMAKE_SIZEOF_VOID_P MATCHES "8")
# Use multiarch path if they exists
if(EXISTS "/usr/lib/i386-linux-gnu")
set(CMAKE_LIBRARY_ARCHITECTURE "i386-linux-gnu")
endif()
# * -fPIC option was removed for multiple reasons.
# - Code only supports the x86 architecture.
# - code uses the ebx register so it's not compliant with PIC.
# - Impacts the performance too much.
# - Only plugins. No package will link to them.
set(CMAKE_POSITION_INDEPENDENT_CODE OFF)
# set module path # set module path
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
@ -60,7 +72,6 @@ include_directories(${PROJECT_SOURCE_DIR}/common/include
${PROJECT_SOURCE_DIR}/common/include/x86emitter ${PROJECT_SOURCE_DIR}/common/include/x86emitter
# WORKAROUND Some issue with multiarch on Debian/Ubuntu # WORKAROUND Some issue with multiarch on Debian/Ubuntu
/usr/include/i386-linux-gnu /usr/include/i386-linux-gnu
/usr/include/x86_64-linux-gnu
) )
# make the translation # make the translation

8
linux_various/generate_pot.sh
View File

@ -52,14 +52,9 @@ MAIN_POT=locales/templates/pcsx2_Main.pot
MAIN_KEY1=_ MAIN_KEY1=_
MAIN_KEY2=pxL MAIN_KEY2=pxL
DEV_POT=locales/templates/pcsx2_Devel.pot
DEV_KEY1=_d DEV_KEY1=_d
DEV_KEY2=pxDt DEV_KEY2=pxDt
ICO_POT=locales/templates/pcsx2_Iconized.pot
ICO_KEY1=pxE
TER_POT=locales/templates/pcsx2_Tertiary.pot
TER_KEY1=_t TER_KEY1=_t
TER_KEY2=pxLt TER_KEY2=pxLt
TER_KEY3=pxEt TER_KEY3=pxEt
@ -70,6 +65,9 @@ xgettext --keyword=$MAIN_KEY1 --keyword=$MAIN_KEY2 --keyword=$DEV_KEY1 --keyword
$input_files --output=$MAIN_POT $input_files --output=$MAIN_POT
sed --in-place $MAIN_POT --expression=s/charset=CHARSET/charset=UTF-8/ sed --in-place $MAIN_POT --expression=s/charset=CHARSET/charset=UTF-8/
ICO_POT=locales/templates/pcsx2_Iconized.pot
ICO_KEY1=pxE
echo "Generate $ICO_POT" echo "Generate $ICO_POT"
xgettext --keyword=$ICO_KEY1 --keyword=$TER_KEY3 $GENERAL_OPTION --copyright-holder="$COPYRIGHT" \ xgettext --keyword=$ICO_KEY1 --keyword=$TER_KEY3 $GENERAL_OPTION --copyright-holder="$COPYRIGHT" \
$input_files --output=$ICO_POT $input_files --output=$ICO_POT