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

linux: clean various linux file into 1 directory 

cmake: automatically install desktop/doc/xpm file in package mode as requested by Rafael
debian: align on latest change


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4909 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut 2011-09-04 20:39:19 +00:00
parent 0f354b7bcd
commit b5959076e5
9 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -91,5 +91,9 @@ endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins")
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Install some files to ease package creation # Install some files to ease package creation
if(PACKAGE_MODE) if(PACKAGE_MODE)
INSTALL(FILES "${PROJECT_SOURCE_DIR}/bin/GameIndex.dbf" DESTINATION ${GAMEINDEX_DIR}) INSTALL(FILES "${PROJECT_SOURCE_DIR}/bin/GameIndex.dbf" DESTINATION "${GAMEINDEX_DIR}")
INSTALL(FILES "${PROJECT_SOURCE_DIR}/linux_various/pcsx2.desktop" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
INSTALL(FILES "${PROJECT_SOURCE_DIR}/linux_various/pcsx2.xpm" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/pixmaps")
INSTALL(FILES "${PROJECT_SOURCE_DIR}/bin/docs/PCSX2_FAQ_0.9.8.pdf" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/pcsx2")
INSTALL(FILES "${PROJECT_SOURCE_DIR}/bin/docs/PCSX2_Readme_0.9.8.pdf" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/pcsx2")
endif(PACKAGE_MODE) endif(PACKAGE_MODE)

2
debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh
View File

@ -106,7 +106,7 @@ mkdir -p $ROOT_DIR;
(cd $ROOT_DIR; (cd $ROOT_DIR;
get_svn_file CMakeLists.txt; get_svn_file CMakeLists.txt;
get_svn_dir common cmake locales pcsx2 tools; get_svn_dir common cmake locales pcsx2 tools;
get_svn_dir debian-unstable-upstream; get_svn_dir debian-unstable-upstream linux_various;
echo "Done") echo "Done")
# separate bin to avoid downloading the .mo file # separate bin to avoid downloading the .mo file

1
debian-unstable-upstream/pcsx2-unstable.docs Normal file
View File

@ -0,0 +1 @@
debian/tmp/usr/share/doc/pcsx2

4
debian-unstable-upstream/pcsx2-unstable.install
View File

@ -1,4 +1,4 @@
usr/bin/pcsx2 usr/bin/pcsx2
debian/pcsx2.desktop usr/share/applications usr/share/applications/pcsx2.desktop
debian/pcsx2.xpm usr/share/pixmaps usr/share/pixmaps/pcsx2.xpm
var/games/pcsx2 var/games/pcsx2

0
detect_missing_file_in_cmake.sh → linux_various/detect_missing_file_in_cmake.sh
View File

0
generate_pot.sh → linux_various/generate_pot.sh
View File

0
debian-unstable-upstream/pcsx2.desktop → linux_various/pcsx2.desktop
View File

0
debian-unstable-upstream/pcsx2.xpm → linux_various/pcsx2.xpm
View File

10
plugins/zerospu2/CMakeLists.txt
View File

@ -94,10 +94,6 @@ add_library(${Output} SHARED
${zerospu2LinuxSources} ${zerospu2LinuxSources}
${zerospu2LinuxHeaders}) ${zerospu2LinuxHeaders})
# set output directory
set_target_properties(${Output} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)
# link target with ALSA # link target with ALSA
target_link_libraries(${Output} ${ALSA_LIBRARIES}) target_link_libraries(${Output} ${ALSA_LIBRARIES})
@ -113,3 +109,9 @@ target_link_libraries(${Output} ${SOUNDTOUCH_LIBRARIES})
if(NOT USER_CMAKE_LD_FLAGS STREQUAL "") if(NOT USER_CMAKE_LD_FLAGS STREQUAL "")
target_link_libraries(${Output} "${USER_CMAKE_LD_FLAGS}") target_link_libraries(${Output} "${USER_CMAKE_LD_FLAGS}")
endif(NOT USER_CMAKE_LD_FLAGS STREQUAL "") endif(NOT USER_CMAKE_LD_FLAGS STREQUAL "")
if(PACKAGE_MODE)
install(TARGETS ${Output} DESTINATION ${PLUGIN_DIR})
else(PACKAGE_MODE)
install(TARGETS ${Output} DESTINATION ${CMAKE_SOURCE_DIR}/bin/plugins)
endif(PACKAGE_MODE)