From 72d47d547ef42c4e832af13f4a74b25b0d696a81 Mon Sep 17 00:00:00 2001 From: "gregory.hainaut" Date: Thu, 12 Apr 2012 06:30:35 +0000 Subject: [PATCH] copyright: * update missing copyright on + plugins/GSdx/config.h + pcsx2/MTVU.h + plugins/zzogl-pg/opengl/ZZHacks.h + plugins/spu2-x/src/DplIIdecoder.cpp * put a copyright for trivial script file + pcsx2/gui/Resources/rebuild.sh + tools/bin2app.sh + plugins/zzogl-pg/opengl/shaders.sh * remove autotool from zzogl * apply the patch for issue 1257. Thanks very much Micove for the hard work. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5154 96395faa-99c1-11dd-bbfe-3dabce05a288 --- cmake/SelectPcsx2Plugins.cmake | 2 +- linux_various/detect_missing_file_in_cmake.sh | 14 + pcsx2/MTVU.h | 16 +- pcsx2/ZipTools/thread_gzip.cpp | 2 +- pcsx2/ZipTools/thread_lzma.cpp | 2 +- pcsx2/gui/Panels/ThemeSelectorPanel.cpp | 2 +- pcsx2/gui/Resources/rebuild.sh | 14 + pcsx2/gui/SysState.cpp | 2 +- plugins/GSdx/config.h | 21 ++ plugins/spu2-x/src/DecodeDPLII.cpp | 2 +- plugins/spu2-x/src/DplIIdecoder.cpp | 20 ++ plugins/spu2-x/src/Linux/ConfigSoundTouch.cpp | 2 +- plugins/zzogl-pg/build.sh | 32 -- plugins/zzogl-pg/opengl/Linux/Makefile.am | 4 - plugins/zzogl-pg/opengl/Makefile.am | 42 --- plugins/zzogl-pg/opengl/ZZHacks.h | 19 ++ plugins/zzogl-pg/opengl/common.h | 10 +- plugins/zzogl-pg/opengl/configure.ac | 123 ------- plugins/zzogl-pg/opengl/depcomp | 1 - plugins/zzogl-pg/opengl/install-sh | 323 ------------------ plugins/zzogl-pg/opengl/linux_replay.cpp | 2 +- plugins/zzogl-pg/opengl/missing | 1 - plugins/zzogl-pg/opengl/shaders.sh | 15 + tools/bin2app.sh | 14 + 24 files changed, 145 insertions(+), 540 deletions(-) delete mode 100644 plugins/zzogl-pg/build.sh delete mode 100644 plugins/zzogl-pg/opengl/Linux/Makefile.am delete mode 100644 plugins/zzogl-pg/opengl/Makefile.am delete mode 100644 plugins/zzogl-pg/opengl/configure.ac delete mode 120000 plugins/zzogl-pg/opengl/depcomp delete mode 100644 plugins/zzogl-pg/opengl/install-sh delete mode 120000 plugins/zzogl-pg/opengl/missing diff --git a/cmake/SelectPcsx2Plugins.cmake b/cmake/SelectPcsx2Plugins.cmake index 060bf0681..88bb76597 100644 --- a/cmake/SelectPcsx2Plugins.cmake +++ b/cmake/SelectPcsx2Plugins.cmake @@ -222,7 +222,7 @@ endif(ALSA_FOUND AND PORTAUDIO_FOUND AND SOUNDTOUCH_FOUND AND common_libs) #--------------------------------------- if(SOUNDTOUCH_FOUND AND ALSA_FOUND) set(zerospu2 TRUE) - # Comment the next line, if you want to compile spu2x + # Comment the next line, if you want to compile zerospu2 set(zerospu2 FALSE) message(STATUS "Don't build zerospu2. It is super-seeded by spu2x") else(SOUNDTOUCH_FOUND AND ALSA_FOUND) diff --git a/linux_various/detect_missing_file_in_cmake.sh b/linux_various/detect_missing_file_in_cmake.sh index c4807b386..a46141b24 100755 --- a/linux_various/detect_missing_file_in_cmake.sh +++ b/linux_various/detect_missing_file_in_cmake.sh @@ -1,5 +1,19 @@ #!/bin/sh +# 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 . + # Script default parameter MAX_DEPTH=1 DIR=$PWD diff --git a/pcsx2/MTVU.h b/pcsx2/MTVU.h index 052bfdac5..d6eec9104 100644 --- a/pcsx2/MTVU.h +++ b/pcsx2/MTVU.h @@ -1,3 +1,17 @@ +/* PCSX2 - PS2 Emulator for PCs + * Copyright (C) 2002-2010 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 . + */ #pragma once #include "System/SysThreads.h" @@ -87,4 +101,4 @@ private: u32 Get_vuCycles(); }; -extern __aligned16 VU_Thread vu1Thread; \ No newline at end of file +extern __aligned16 VU_Thread vu1Thread; diff --git a/pcsx2/ZipTools/thread_gzip.cpp b/pcsx2/ZipTools/thread_gzip.cpp index ca437fda8..41d09eecd 100644 --- a/pcsx2/ZipTools/thread_gzip.cpp +++ b/pcsx2/ZipTools/thread_gzip.cpp @@ -3,7 +3,7 @@ * * 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 te License, or (at your option) any later version. + * 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 diff --git a/pcsx2/ZipTools/thread_lzma.cpp b/pcsx2/ZipTools/thread_lzma.cpp index fd06a199f..48c9329f2 100644 --- a/pcsx2/ZipTools/thread_lzma.cpp +++ b/pcsx2/ZipTools/thread_lzma.cpp @@ -3,7 +3,7 @@ * * 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 te License, or (at your option) any later version. + * 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 diff --git a/pcsx2/gui/Panels/ThemeSelectorPanel.cpp b/pcsx2/gui/Panels/ThemeSelectorPanel.cpp index 6c9719b45..e9044824f 100644 --- a/pcsx2/gui/Panels/ThemeSelectorPanel.cpp +++ b/pcsx2/gui/Panels/ThemeSelectorPanel.cpp @@ -3,7 +3,7 @@ * * 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 te License, or (at your option) any later version. + * 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 diff --git a/pcsx2/gui/Resources/rebuild.sh b/pcsx2/gui/Resources/rebuild.sh index 51cb30614..6a4b060dd 100755 --- a/pcsx2/gui/Resources/rebuild.sh +++ b/pcsx2/gui/Resources/rebuild.sh @@ -1,5 +1,19 @@ #!/bin/sh +# 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 . + ../../../tools/bin/bin2cpp BackgroundLogo.png ../../../tools/bin/bin2cpp AppIcon16.png ../../../tools/bin/bin2cpp AppIcon32.png diff --git a/pcsx2/gui/SysState.cpp b/pcsx2/gui/SysState.cpp index c976dd058..dafa635e7 100644 --- a/pcsx2/gui/SysState.cpp +++ b/pcsx2/gui/SysState.cpp @@ -3,7 +3,7 @@ * * 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 te License, or (at your option) any later version. + * 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 diff --git a/plugins/GSdx/config.h b/plugins/GSdx/config.h index 1f63b0142..745bc3582 100644 --- a/plugins/GSdx/config.h +++ b/plugins/GSdx/config.h @@ -1,3 +1,24 @@ +/* + * Copyright (C) 2007-2009 Gabest + * http://www.gabest.org + * + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Make; see the file COPYING. If not, write to + * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + * http://www.gnu.org/copyleft/gpl.html + * + */ + #pragma once //#define ENABLE_VTUNE diff --git a/plugins/spu2-x/src/DecodeDPLII.cpp b/plugins/spu2-x/src/DecodeDPLII.cpp index bd219ca8d..57e89ba3b 100644 --- a/plugins/spu2-x/src/DecodeDPLII.cpp +++ b/plugins/spu2-x/src/DecodeDPLII.cpp @@ -5,7 +5,7 @@ * * This library 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 Foundation; either version 2.1 of the the License, or (at your + * Software Foundation; either version 2.1 of the License, or (at your * option) any later version. * * This library is distributed in the hope that it will be useful, but WITHOUT diff --git a/plugins/spu2-x/src/DplIIdecoder.cpp b/plugins/spu2-x/src/DplIIdecoder.cpp index afe054679..4fad8137a 100644 --- a/plugins/spu2-x/src/DplIIdecoder.cpp +++ b/plugins/spu2-x/src/DplIIdecoder.cpp @@ -1,3 +1,23 @@ +/* SPU2-X, A plugin for Emulating the Sound Processing Unit of the Playstation 2 + * Developed and maintained by the Pcsx2 Development Team. + * + * Original portions from SPU2ghz are (c) 2008 by David Quintana [gigaherz] + * + * This library 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 Foundation; either version 2.1 of the License, or (at your + * option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * 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 this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + #include "Global.h" static const u8 sLogTable[256] = { diff --git a/plugins/spu2-x/src/Linux/ConfigSoundTouch.cpp b/plugins/spu2-x/src/Linux/ConfigSoundTouch.cpp index ccc23215b..d1535fffc 100644 --- a/plugins/spu2-x/src/Linux/ConfigSoundTouch.cpp +++ b/plugins/spu2-x/src/Linux/ConfigSoundTouch.cpp @@ -5,7 +5,7 @@ * * This library 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 Foundation; either version 2.1 of the the License, or (at your + * Software Foundation; either version 2.1 of the License, or (at your * option) any later version. * * This library is distributed in the hope that it will be useful, but WITHOUT diff --git a/plugins/zzogl-pg/build.sh b/plugins/zzogl-pg/build.sh deleted file mode 100644 index 4271e3b1c..000000000 --- a/plugins/zzogl-pg/build.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -curdir=`pwd` - -echo ---------------------- -echo Building ZZOpenGL -echo ---------------------- - -cd ${curdir}/opengl - -if [ $# -gt 0 ] && [ $1 = "all" ] -then - -aclocal -automake -autoconf -chmod +x configure -./configure --enable-sse2 --prefix=${PCSX2PLUGINS} -make clean -make install - -else -make $@ -fi - -if [ $? -ne 0 ] -then -exit 1 -fi - -#cp libZeroGSogl*.so* ${PCSX2PLUGINS}/ -cp Win32/ps2hw.dat ${PCSX2PLUGINS}/ diff --git a/plugins/zzogl-pg/opengl/Linux/Makefile.am b/plugins/zzogl-pg/opengl/Linux/Makefile.am deleted file mode 100644 index 49198459e..000000000 --- a/plugins/zzogl-pg/opengl/Linux/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -noinst_LIBRARIES = libZeroGSLinux.a - -INCLUDES = $(shell pkg-config --cflags gtk+-2.0) -I@srcdir@/../ -I@srcdir@/../../../../common/include -libZeroGSLinux_a_SOURCES = Conf.cpp Linux.cpp diff --git a/plugins/zzogl-pg/opengl/Makefile.am b/plugins/zzogl-pg/opengl/Makefile.am deleted file mode 100644 index faf2a7fc3..000000000 --- a/plugins/zzogl-pg/opengl/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -# Create a shared library libzzoglpg -AUTOMAKE_OPTIONS = foreign -noinst_LIBRARIES = libzzoglpg.a -INCLUDES = -I@srcdir@/../../../common/include -I@srcdir@/common -I@srcdir@/../../../3rdparty/ - -libzzoglpg_a_CPPFLAGS = $(shell pkg-config --cflags gtk+-2.0) -libzzoglpg_a_CXXFLAGS = $(shell pkg-config --cflags gtk+-2.0) - -# Create a shared object by faking an exe (thanks to ODE makefiles) -traplibdir=$(prefix) - - -if RELEASE_TO_PUBLIC -preext=r -endif - -EXEEXT=$(preext)@so_ext@ - -traplib_PROGRAMS=libzzoglpg -libzzoglpg_SOURCES= -libzzoglpg_DEPENDENCIES = libzzoglpg.a ../../../deps/release/libUtilities.a -libzzoglpg_LDFLAGS= @SHARED_LDFLAGS@ -libzzoglpg_LDFLAGS+=-Wl,-soname,@ZEROGS_SONAME@ -libzzoglpg_LDADD=$(libzzoglpg_a_OBJECTS) - -libzzoglpg_a_SOURCES = \ -GSmain.cpp GLWinX11.cpp GifTransfer.cpp memcpy_amd.cpp Regs.cpp x86.cpp zpipe.cpp Mem.cpp Profile.cpp Profile.h \ -rasterfont.cpp targets.cpp zerogs.cpp ZZoglVB.cpp ZZoglShoots.cpp ZZoglCreate.cpp \ -ZZoglShaders.cpp ZZoglCRTC.cpp ZZoglSave.cpp ZZoglFlush.cpp \ -Mem_Swizzle.h Mem_Tables.cpp Mem_Transmit.h Mem_Swizzle.cpp - - -libzzoglpg_a_SOURCES += x86-32.S - -if SSE2 -CCASFLAGS+= -DZEROGS_SSE2 -endif - -libzzoglpg_a_DEPENDENCIES = Linux/libZeroGSLinux.a ../../../deps/release/libUtilities.a -libzzoglpg_LDADD += Linux/libZeroGSLinux.a ../../../deps/release/libUtilities.a - -SUBDIRS = Linux ZeroGSShaders . diff --git a/plugins/zzogl-pg/opengl/ZZHacks.h b/plugins/zzogl-pg/opengl/ZZHacks.h index 2df9fd098..b4bf03b28 100644 --- a/plugins/zzogl-pg/opengl/ZZHacks.h +++ b/plugins/zzogl-pg/opengl/ZZHacks.h @@ -1,3 +1,22 @@ +/* ZZ Open GL graphics plugin + * Copyright (c)2009-2010 zeydlitz@gmail.com, arcum42@gmail.com + * Based on Zerofrog's ZeroGS KOSMOS (c)2005-2008 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + #ifndef ZZHACKS_H_INCLUDED #define ZZHACKS_H_INCLUDED diff --git a/plugins/zzogl-pg/opengl/common.h b/plugins/zzogl-pg/opengl/common.h index 3c87f46b6..5202a6350 100644 --- a/plugins/zzogl-pg/opengl/common.h +++ b/plugins/zzogl-pg/opengl/common.h @@ -1,19 +1,19 @@ /* ZZ Open GL graphics plugin - * Zerofrog's ZeroGS KOSMOS (c)2005-2008 + * Copyright (c)2005-2008 Zerofrog's ZeroGS KOSMOS * - * Based on ffmepeg program, (c)2006 Michael Niedermayer + * Based on the ffmpeg program, (c)2006 Michael Niedermayer * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * 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 General Public License for more details. + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ diff --git a/plugins/zzogl-pg/opengl/configure.ac b/plugins/zzogl-pg/opengl/configure.ac deleted file mode 100644 index 8d77c714f..000000000 --- a/plugins/zzogl-pg/opengl/configure.ac +++ /dev/null @@ -1,123 +0,0 @@ -AC_INIT(ZZOgl-pg,0.1.0,arcum42@gmail.com) - -AM_INIT_AUTOMAKE(ZZOgl-pg,0.1.0) - -AC_PROG_CC([gcc g++ cl KCC CC cxx cc++ xlC aCC c++]) -AC_PROG_CXX([gcc g++ cl KCC CC cxx cc++ xlC aCC c++]) -AC_PROG_CPP([gcc g++ cl KCC CC cxx cc++ xlC aCC c++]) -AM_PROG_CC_C_O - -AC_PROG_INSTALL -AC_PROG_RANLIB - -dnl necessary for compiling assembly -AM_PROG_AS - -ZEROGS_CURRENT=0 -ZEROGS_REVISION=1 -ZEROGS_AGE=0 -ZEROGS_SONAME=libzzoglpg.so.[$ZEROGS_CURRENT].[$ZEROGS_REVISION].[$ZEROGS_AGE] -ZEROGS_RELEASE=[$ZEROGS_CURRENT].[$ZEROGS_REVISION].[$ZEROGS_AGE] - -AC_SUBST(ZEROGS_CURRENT) -AC_SUBST(ZEROGS_REVISION) -AC_SUBST(ZEROGS_AGE) -AC_SUBST(ZEROGS_RELEASE) -AC_SUBST(ZEROGS_SONAME) - -CFLAGS=" -I/opt/cg/include -L/opt/cg/lib -Wall -Wno-format -Wno-unused " -CPPFLAGS=" -I/opt/cg/include -L/opt/cg/lib -Wall -Wno-format -Wno-unused " -CXXFLAGS=" -I/opt/cg/include -L/opt/cg/lib -Wall -Wno-format -Wno-unused " - -dnl Check for debug build -AC_MSG_CHECKING(debug build) -AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [debug build]), - debug=$enableval,debug=no) -if test "x$debug" == xyes -then - AC_DEFINE(_DEBUG,1,[_DEBUG]) - CFLAGS+="-g " - CPPFLAGS+="-g " - CXXFLAGS+="-g -fpermissive " -else - AC_DEFINE(NDEBUG,1,[NDEBUG]) - CFLAGS+="-O2 -msse2 " - CPPFLAGS+="-O2 -msse2 " - CXXFLAGS+="-O2 -msse2 -fno-regmove " -fi -AC_MSG_RESULT($debug) - -AC_CHECK_FUNCS([ _aligned_malloc _aligned_free ], AC_DEFINE(HAVE_ALIGNED_MALLOC)) - -dnl Check for dev build -AC_MSG_CHECKING(for development build...) -AC_ARG_ENABLE(devbuild, AC_HELP_STRING([--enable-devbuild], [Special Build for developers that simplifies testing and adds extra checks]), - devbuild=$enableval,devbuild=no) -if test "x$devbuild" == xno -then - AC_DEFINE(RELEASE_TO_PUBLIC,1,[RELEASE_TO_PUBLIC]) -fi -AC_MSG_RESULT($devbuild) -AM_CONDITIONAL(RELEASE_TO_PUBLIC, test x$devbuild = xno) - -dnl Check for recompilation -AC_MSG_CHECKING(check for sse2...) -AC_ARG_ENABLE(sse2, AC_HELP_STRING([--enable-sse2], [Enable sse2 instructions]), - sse2=$enableval,sse2=no) -if test "x$sse2" == xyes -then - AC_DEFINE(ZEROGS_SSE2,1,[ZEROGS_SSE2]) -fi -AC_MSG_RESULT($sse2) -AM_CONDITIONAL(SSE2, test x$sse2 = xyes) - -dnl gtk -AC_MSG_CHECKING(gtk2+) -AC_CHECK_PROG(GTK_CONFIG, pkg-config, pkg-config) -LIBS+=$(pkg-config --libs gtk+-2.0) - -dnl bindir = pcsx2exe - -dnl assuming linux environment -so_ext=".so.$ZEROGS_RELEASE" -SHARED_LDFLAGS="-shared" -AC_SUBST(so_ext) -AC_SUBST(SHARED_LDFLAGS) - -AC_MSG_CHECKING(OpenGL) -AC_CHECK_HEADERS([GL/gl.h GL/glu.h GL/glext.h],,, - [[#if HAVE_GL_GL_H - #include - #endif - #if HAVE_GL_GLU_H - #include - #endif - ]]) -AC_CHECK_LIB(GL,main,[LIBS="$LIBS -lGL"]) -AC_CHECK_LIB(GLU,main,[LIBS="$LIBS -lGLU"]) -AC_CHECK_LIB(GLEW,main,[LIBS="$LIBS -lGLEW"]) -AC_MSG_CHECKING(Cg) -AC_CHECK_HEADERS([Cg/cg.h Cg/cgGL.h]) -AC_CHECK_LIB(jpeg,main,[LIBS="$LIBS -ljpeg"]) -AC_CHECK_HEADERS([jpeglib.h],,[AC_MSG_ERROR(Install libjpeg-dev)]) -AC_CHECK_LIB(pthread,main,[LIBS="$LIBS -lpthread"]) -AC_CHECK_LIB(stdc++,main,[LIBS="$LIBS -lstdc++"]) -AC_CHECK_LIB(z,main,[LIBS="$LIBS -lz"]) -AC_CHECK_LIB(dl,main,[LIBS="$LIBS -ldl"]) -AC_CHECK_LIB(Xxf86vm,main,[LIBS="$LIBS -lXxf86vm"],[echo "Error! You need to have libXxf86vm-dev." ; exit -1]) - -dnl AC_CHECK_LIB(Cg,cgCreateContext,[LIBS="$LIBS -lCg"]) -dnl AC_CHECK_LIB(CgGL,cgGLEnableProfile,[LIBS="$LIBS -lCgGL"]) -LIBS+=" -lCg -lCgGL" - -AC_OUTPUT([ - Makefile - Linux/Makefile - ZeroGSShaders/Makefile - ]) - -echo "Configuration:" -echo " Target system type: $target" -echo " Debug build? $debug" -echo " Dev build? $devbuild" -echo " SSE2 enabled? $sse2" diff --git a/plugins/zzogl-pg/opengl/depcomp b/plugins/zzogl-pg/opengl/depcomp deleted file mode 120000 index b0ad20c05..000000000 --- a/plugins/zzogl-pg/opengl/depcomp +++ /dev/null @@ -1 +0,0 @@ -/usr/share/automake-1.11/depcomp \ No newline at end of file diff --git a/plugins/zzogl-pg/opengl/install-sh b/plugins/zzogl-pg/opengl/install-sh deleted file mode 100644 index 4d4a9519e..000000000 --- a/plugins/zzogl-pg/opengl/install-sh +++ /dev/null @@ -1,323 +0,0 @@ -#!/bin/sh -# install - install a program, script, or datafile - -scriptversion=2005-05-14.22 - -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" - -# put in absolute paths if you don't have them in your path; or use env. vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" - -chmodcmd="$chmodprog 0755" -chowncmd= -chgrpcmd= -stripcmd= -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src= -dst= -dir_arg= -dstarg= -no_target_directory= - -usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE - or: $0 [OPTION]... SRCFILES... DIRECTORY - or: $0 [OPTION]... -t DIRECTORY SRCFILES... - or: $0 [OPTION]... -d DIRECTORIES... - -In the 1st form, copy SRCFILE to DSTFILE. -In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. -In the 4th, create DIRECTORIES. - -Options: --c (ignored) --d create directories instead of installing files. --g GROUP $chgrpprog installed files to GROUP. --m MODE $chmodprog installed files to MODE. --o USER $chownprog installed files to USER. --s $stripprog installed files. --t DIRECTORY install into DIRECTORY. --T report an error if DSTFILE is a directory. ---help display this help and exit. ---version display version info and exit. - -Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG -" - -while test -n "$1"; do - case $1 in - -c) shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - --help) echo "$usage"; exit $?;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -s) stripcmd=$stripprog - shift - continue;; - - -t) dstarg=$2 - shift - shift - continue;; - - -T) no_target_directory=true - shift - continue;; - - --version) echo "$0 $scriptversion"; exit $?;; - - *) # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - test -n "$dir_arg$dstarg" && break - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dstarg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dstarg" - shift # fnord - fi - shift # arg - dstarg=$arg - done - break;; - esac -done - -if test -z "$1"; then - if test -z "$dir_arg"; then - echo "$0: no input file specified." >&2 - exit 1 - fi - # It's OK to call `install-sh -d' without argument. - # This can happen when creating conditional directories. - exit 0 -fi - -for src -do - # Protect names starting with `-'. - case $src in - -*) src=./$src ;; - esac - - if test -n "$dir_arg"; then - dst=$src - src= - - if test -d "$dst"; then - mkdircmd=: - chmodcmd= - else - mkdircmd=$mkdirprog - fi - else - # Waiting for this to be detected by the "$cpprog $src $dsttmp" command - # might cause directories to be created, which would be especially bad - # if $src (and thus $dsttmp) contains '*'. - if test ! -f "$src" && test ! -d "$src"; then - echo "$0: $src does not exist." >&2 - exit 1 - fi - - if test -z "$dstarg"; then - echo "$0: no destination specified." >&2 - exit 1 - fi - - dst=$dstarg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst ;; - esac - - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. - if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dstarg: Is a directory" >&2 - exit 1 - fi - dst=$dst/`basename "$src"` - fi - fi - - # This sed command emulates the dirname command. - dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` - - # Make sure that the destination directory exists. - - # Skip lots of stat calls in the usual case. - if test ! -d "$dstdir"; then - defaultIFS=' - ' - IFS="${IFS-$defaultIFS}" - - oIFS=$IFS - # Some sh's can't handle IFS=/ for some reason. - IFS='%' - set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` - shift - IFS=$oIFS - - pathcomp= - - while test $# -ne 0 ; do - pathcomp=$pathcomp$1 - shift - if test ! -d "$pathcomp"; then - $mkdirprog "$pathcomp" - # mkdir can fail with a `File exist' error in case several - # install-sh are creating the directory concurrently. This - # is OK. - test -d "$pathcomp" || exit - fi - pathcomp=$pathcomp/ - done - fi - - if test -n "$dir_arg"; then - $doit $mkdircmd "$dst" \ - && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } - - else - dstfile=`basename "$dst"` - - # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - - # Trap to clean up those temp files at exit. - trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - trap '(exit $?); exit' 1 2 13 15 - - # Copy the file name to the temp name. - $doit $cpprog "$src" "$dsttmp" && - - # and set any options; do chmod last to preserve setuid bits. - # - # If any of these fail, we abort the whole thing. If we want to - # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $cpprog $src $dsttmp" command. - # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && - - # Now rename the file to the real destination. - { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ - || { - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - if test -f "$dstdir/$dstfile"; then - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ - || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ - || { - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit 1 - } - else - : - fi - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" - } - } - fi || { (exit 1); exit 1; } -done - -# The final little trick to "correctly" pass the exit status to the exit trap. -{ - (exit 0); exit 0 -} - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/plugins/zzogl-pg/opengl/linux_replay.cpp b/plugins/zzogl-pg/opengl/linux_replay.cpp index f95b19b0a..28ca68808 100644 --- a/plugins/zzogl-pg/opengl/linux_replay.cpp +++ b/plugins/zzogl-pg/opengl/linux_replay.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 20011-2012 Hainaut gregory + * Copyright (C) 2011-2012 Hainaut gregory * * This Program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/plugins/zzogl-pg/opengl/missing b/plugins/zzogl-pg/opengl/missing deleted file mode 120000 index 20bc5b0ed..000000000 --- a/plugins/zzogl-pg/opengl/missing +++ /dev/null @@ -1 +0,0 @@ -/usr/share/automake-1.11/missing \ No newline at end of file diff --git a/plugins/zzogl-pg/opengl/shaders.sh b/plugins/zzogl-pg/opengl/shaders.sh index 7b6a8d179..7c5e57b04 100755 --- a/plugins/zzogl-pg/opengl/shaders.sh +++ b/plugins/zzogl-pg/opengl/shaders.sh @@ -1,3 +1,18 @@ #!/bin/sh + +# 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 . + ./zgsbuild ps2hw.fx cp ps2hw.dat ../../../bin/plugins/ diff --git a/tools/bin2app.sh b/tools/bin2app.sh index 6c1c0a20c..64461ad9a 100755 --- a/tools/bin2app.sh +++ b/tools/bin2app.sh @@ -1,5 +1,19 @@ #!/bin/sh +# 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 . + # Probably self-explanatory: This batch file compiles a single souce image into a # CPP header file for use by pcsx2. #