From d75da041f63bab8fb5604319fc5504cb0f8c2c02 Mon Sep 17 00:00:00 2001 From: "gregory.hainaut" Date: Mon, 16 Apr 2012 15:36:16 +0000 Subject: [PATCH] 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 --- bin/launch_pcsx2_linux.sh | 14 ++++++++++++++ linux_various/hex2h.pl | 0 plugins/CDVDnull/CMakeLists.txt | 5 +++++ plugins/FWnull/CMakeLists.txt | 5 +++++ plugins/GSdx/CMakeLists.txt | 5 +++++ plugins/GSnull/CMakeLists.txt | 8 ++++++++ plugins/PadNull/CMakeLists.txt | 8 ++++++++ plugins/SPU2null/CMakeLists.txt | 5 +++++ plugins/USBnull/CMakeLists.txt | 5 +++++ plugins/dev9null/CMakeLists.txt | 5 +++++ plugins/onepad/CMakeLists.txt | 8 ++++++++ plugins/spu2-x/src/CMakeLists.txt | 5 +++++ plugins/spu2-x/src/WavFile.cpp | 13 +++++++------ plugins/spu2-x/src/WavFile.h | 13 +++++++------ plugins/zzogl-pg/opengl/CMakeLists.txt | 8 ++++++++ 15 files changed, 95 insertions(+), 12 deletions(-) mode change 100644 => 100755 linux_various/hex2h.pl diff --git a/bin/launch_pcsx2_linux.sh b/bin/launch_pcsx2_linux.sh index f46f3cc1b9..afdd7a5160 100755 --- a/bin/launch_pcsx2_linux.sh +++ b/bin/launch_pcsx2_linux.sh @@ -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 . + # 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. diff --git a/linux_various/hex2h.pl b/linux_various/hex2h.pl old mode 100644 new mode 100755 diff --git a/plugins/CDVDnull/CMakeLists.txt b/plugins/CDVDnull/CMakeLists.txt index 10d245b5ad..27a72d14fb 100644 --- a/plugins/CDVDnull/CMakeLists.txt +++ b/plugins/CDVDnull/CMakeLists.txt @@ -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}") diff --git a/plugins/FWnull/CMakeLists.txt b/plugins/FWnull/CMakeLists.txt index 4e3c93d110..0d8a7ba36c 100644 --- a/plugins/FWnull/CMakeLists.txt +++ b/plugins/FWnull/CMakeLists.txt @@ -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}") diff --git a/plugins/GSdx/CMakeLists.txt b/plugins/GSdx/CMakeLists.txt index 91dfee01e0..6071e30562 100644 --- a/plugins/GSdx/CMakeLists.txt +++ b/plugins/GSdx/CMakeLists.txt @@ -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}") diff --git a/plugins/GSnull/CMakeLists.txt b/plugins/GSnull/CMakeLists.txt index 3ca4b35ffb..15bfa9a875 100644 --- a/plugins/GSnull/CMakeLists.txt +++ b/plugins/GSnull/CMakeLists.txt @@ -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}") diff --git a/plugins/PadNull/CMakeLists.txt b/plugins/PadNull/CMakeLists.txt index 6c454922a4..2cba99fd5d 100644 --- a/plugins/PadNull/CMakeLists.txt +++ b/plugins/PadNull/CMakeLists.txt @@ -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}") diff --git a/plugins/SPU2null/CMakeLists.txt b/plugins/SPU2null/CMakeLists.txt index 8c1c1eb6e1..08271ef5f7 100644 --- a/plugins/SPU2null/CMakeLists.txt +++ b/plugins/SPU2null/CMakeLists.txt @@ -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}") diff --git a/plugins/USBnull/CMakeLists.txt b/plugins/USBnull/CMakeLists.txt index cec09e425e..55cfa8aefe 100644 --- a/plugins/USBnull/CMakeLists.txt +++ b/plugins/USBnull/CMakeLists.txt @@ -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}") diff --git a/plugins/dev9null/CMakeLists.txt b/plugins/dev9null/CMakeLists.txt index e21929d0fa..3d53e81212 100644 --- a/plugins/dev9null/CMakeLists.txt +++ b/plugins/dev9null/CMakeLists.txt @@ -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}") diff --git a/plugins/onepad/CMakeLists.txt b/plugins/onepad/CMakeLists.txt index 12247e384c..4f24cb52cf 100644 --- a/plugins/onepad/CMakeLists.txt +++ b/plugins/onepad/CMakeLists.txt @@ -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}") diff --git a/plugins/spu2-x/src/CMakeLists.txt b/plugins/spu2-x/src/CMakeLists.txt index 8395a9a88b..9d523e6b63 100644 --- a/plugins/spu2-x/src/CMakeLists.txt +++ b/plugins/spu2-x/src/CMakeLists.txt @@ -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}") diff --git a/plugins/spu2-x/src/WavFile.cpp b/plugins/spu2-x/src/WavFile.cpp index dc0953ace3..f25abccc16 100644 --- a/plugins/spu2-x/src/WavFile.cpp +++ b/plugins/spu2-x/src/WavFile.cpp @@ -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 . diff --git a/plugins/spu2-x/src/WavFile.h b/plugins/spu2-x/src/WavFile.h index 2e07f97edb..d65ddb6046 100644 --- a/plugins/spu2-x/src/WavFile.h +++ b/plugins/spu2-x/src/WavFile.h @@ -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 . diff --git a/plugins/zzogl-pg/opengl/CMakeLists.txt b/plugins/zzogl-pg/opengl/CMakeLists.txt index ed70bb2698..8f19622ef8 100644 --- a/plugins/zzogl-pg/opengl/CMakeLists.txt +++ b/plugins/zzogl-pg/opengl/CMakeLists.txt @@ -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}")