mirror of https://github.com/PCSX2/pcsx2.git
copyright: soundtouch was LGPL2.1 not LGPL2.1+, add an header to launch_pcsx2_linux.sh
cmake: keep all library for the linking of plugins hex2h.pl: add svn:executable git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5157 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
parent
0f60fc2ffc
commit
d75da041f6
|
@ -1,5 +1,19 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
# PCSX2 - PS2 Emulator for PCs
|
||||
# Copyright (C) 2002-2011 PCSX2 Dev Team
|
||||
#
|
||||
# PCSX2 is free software: you can redistribute it and/or modify it under the terms
|
||||
# of the GNU Lesser General Public License as published by the Free Software Found-
|
||||
# ation, either version 3 of the License, or (at your option) any later version.
|
||||
#
|
||||
# PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
|
||||
# without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||
# PURPOSE. See the GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License along with PCSX2.
|
||||
# If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# This script is a small wrapper to the PCSX2 exectuable. The purpose is to
|
||||
# launch PCSX2 from the same repository every times.
|
||||
# Rationale: There is no guarantee on the directory when PCSX2 is launched from a shortcut.
|
||||
|
|
|
@ -63,6 +63,11 @@ add_library(${Output} SHARED
|
|||
${CDVDnullHeaders}
|
||||
)
|
||||
|
||||
if(Linux)
|
||||
# link target with gtk2
|
||||
target_link_libraries(${Output} ${GTK2_LIBRARIES})
|
||||
endif(Linux)
|
||||
|
||||
# User flags options
|
||||
if(NOT USER_CMAKE_LD_FLAGS STREQUAL "")
|
||||
target_link_libraries(${Output} "${USER_CMAKE_LD_FLAGS}")
|
||||
|
|
|
@ -75,6 +75,11 @@ add_library(${Output} SHARED
|
|||
${FWnullLinuxSources}
|
||||
${FWnullLinuxHeaders})
|
||||
|
||||
if(Linux)
|
||||
# link target with gtk2
|
||||
target_link_libraries(${Output} ${GTK2_LIBRARIES})
|
||||
endif(Linux)
|
||||
|
||||
# User flags options
|
||||
if(NOT USER_CMAKE_LD_FLAGS STREQUAL "")
|
||||
target_link_libraries(${Output} "${USER_CMAKE_LD_FLAGS}")
|
||||
|
|
|
@ -176,6 +176,11 @@ target_link_libraries(${Output} ${X11_LIBRARIES})
|
|||
# link target with SDL
|
||||
target_link_libraries(${Output} ${SDL_LIBRARY})
|
||||
|
||||
if(Linux)
|
||||
# link target with gtk2
|
||||
target_link_libraries(${Output} ${GTK2_LIBRARIES})
|
||||
endif(Linux)
|
||||
|
||||
# User flags options
|
||||
if(NOT USER_CMAKE_LD_FLAGS STREQUAL "")
|
||||
target_link_libraries(${Output} "${USER_CMAKE_LD_FLAGS}")
|
||||
|
|
|
@ -94,6 +94,14 @@ add_library(${Output} SHARED
|
|||
${GSnullLinuxSources}
|
||||
${GSnullLinuxHeaders})
|
||||
|
||||
if(Linux)
|
||||
# link target with gtk2
|
||||
target_link_libraries(${Output} ${GTK2_LIBRARIES})
|
||||
endif(Linux)
|
||||
|
||||
# link target with X11
|
||||
target_link_libraries(${Output} ${X11_LIBRARIES})
|
||||
|
||||
# User flags options
|
||||
if(NOT USER_CMAKE_LD_FLAGS STREQUAL "")
|
||||
target_link_libraries(${Output} "${USER_CMAKE_LD_FLAGS}")
|
||||
|
|
|
@ -77,6 +77,14 @@ add_library(${Output} SHARED
|
|||
${PadNullLinuxSources}
|
||||
${PadNullLinuxHeaders})
|
||||
|
||||
if(Linux)
|
||||
# link target with gtk2
|
||||
target_link_libraries(${Output} ${GTK2_LIBRARIES})
|
||||
endif(Linux)
|
||||
|
||||
# link target with X11
|
||||
target_link_libraries(${Output} ${X11_LIBRARIES})
|
||||
|
||||
# User flags options
|
||||
if(NOT USER_CMAKE_LD_FLAGS STREQUAL "")
|
||||
target_link_libraries(${Output} "${USER_CMAKE_LD_FLAGS}")
|
||||
|
|
|
@ -74,6 +74,11 @@ add_library(${Output} SHARED
|
|||
${SPU2nullLinuxSources}
|
||||
${SPU2nullLinuxHeaders})
|
||||
|
||||
if(Linux)
|
||||
# link target with gtk2
|
||||
target_link_libraries(${Output} ${GTK2_LIBRARIES})
|
||||
endif(Linux)
|
||||
|
||||
# User flags options
|
||||
if(NOT USER_CMAKE_LD_FLAGS STREQUAL "")
|
||||
target_link_libraries(${Output} "${USER_CMAKE_LD_FLAGS}")
|
||||
|
|
|
@ -76,6 +76,11 @@ add_library(${Output} SHARED
|
|||
${USBnullLinuxSources}
|
||||
${USBnullLinuxHeaders})
|
||||
|
||||
if(Linux)
|
||||
# link target with gtk2
|
||||
target_link_libraries(${Output} ${GTK2_LIBRARIES})
|
||||
endif(Linux)
|
||||
|
||||
# User flags options
|
||||
if(NOT USER_CMAKE_LD_FLAGS STREQUAL "")
|
||||
target_link_libraries(${Output} "${USER_CMAKE_LD_FLAGS}")
|
||||
|
|
|
@ -73,6 +73,11 @@ add_library(${Output} SHARED
|
|||
${dev9nullLinuxSources}
|
||||
${dev9nullLinuxHeaders})
|
||||
|
||||
if(Linux)
|
||||
# link target with gtk2
|
||||
target_link_libraries(${Output} ${GTK2_LIBRARIES})
|
||||
endif(Linux)
|
||||
|
||||
# User flags options
|
||||
if(NOT USER_CMAKE_LD_FLAGS STREQUAL "")
|
||||
target_link_libraries(${Output} "${USER_CMAKE_LD_FLAGS}")
|
||||
|
|
|
@ -85,6 +85,14 @@ add_library(${Output} SHARED
|
|||
# link target with SDL
|
||||
target_link_libraries(${Output} ${SDL_LIBRARY})
|
||||
|
||||
if(Linux)
|
||||
# link target with gtk2
|
||||
target_link_libraries(${Output} ${GTK2_LIBRARIES})
|
||||
endif(Linux)
|
||||
|
||||
# link target with X11
|
||||
target_link_libraries(${Output} ${X11_LIBRARIES})
|
||||
|
||||
# User flags options
|
||||
if(NOT USER_CMAKE_LD_FLAGS STREQUAL "")
|
||||
target_link_libraries(${Output} "${USER_CMAKE_LD_FLAGS}")
|
||||
|
|
|
@ -121,6 +121,11 @@ target_link_libraries(${Output} ${PORTAUDIO_LIBRARIES})
|
|||
# link target with SoundTouch
|
||||
target_link_libraries(${Output} ${SOUNDTOUCH_LIBRARIES})
|
||||
|
||||
if(Linux)
|
||||
# link target with gtk2
|
||||
target_link_libraries(${Output} ${GTK2_LIBRARIES})
|
||||
endif(Linux)
|
||||
|
||||
# User flags options
|
||||
if(NOT USER_CMAKE_LD_FLAGS STREQUAL "")
|
||||
target_link_libraries(${Output} "${USER_CMAKE_LD_FLAGS}")
|
||||
|
|
|
@ -4,13 +4,14 @@
|
|||
* The file is based on WavFile.h from SoundTouch library.
|
||||
* Original portions are (c) 2009 by Olli Parviainen (oparviai 'at' iki.fi)
|
||||
*
|
||||
* SPU2-X is free software: you can redistribute it and/or modify it under the terms
|
||||
* of the GNU Lesser General Public License as published by the Free Software Found-
|
||||
* ation, either version 3 of the License, or (at your option) any later version.
|
||||
* This file is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License, version 2.1
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* SPU2-X is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
|
||||
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||
* PURPOSE. See the GNU Lesser General Public License for more details.
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with SPU2-X. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
|
|
@ -4,13 +4,14 @@
|
|||
* The file is based on WavFile.h from SoundTouch library.
|
||||
* Original portions are (c) 2009 by Olli Parviainen (oparviai 'at' iki.fi)
|
||||
*
|
||||
* SPU2-X is free software: you can redistribute it and/or modify it under the terms
|
||||
* of the GNU Lesser General Public License as published by the Free Software Found-
|
||||
* ation, either version 3 of the License, or (at your option) any later version.
|
||||
* This file is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License, version 2.1
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* SPU2-X is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
|
||||
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||
* PURPOSE. See the GNU Lesser General Public License for more details.
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with SPU2-X. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
|
|
@ -164,6 +164,14 @@ target_link_libraries(${Output} ${X11_LIBRARIES})
|
|||
# link target with jpeg
|
||||
target_link_libraries(${Output} ${JPEG_LIBRARIES})
|
||||
|
||||
if(Linux)
|
||||
# link target with gtk2
|
||||
target_link_libraries(${Output} ${GTK2_LIBRARIES})
|
||||
endif(Linux)
|
||||
|
||||
# link target with zlib
|
||||
target_link_libraries(${Output} ${ZLIB_LIBRARIES})
|
||||
|
||||
# User flags options
|
||||
if(NOT USER_CMAKE_LD_FLAGS STREQUAL "")
|
||||
target_link_libraries(${Output} "${USER_CMAKE_LD_FLAGS}")
|
||||
|
|
Loading…
Reference in New Issue