ReorderingMTGS: Sync with trunk

git-svn-id: http://pcsx2.googlecode.com/svn/branches/ReorderingMTGS@3492 96395faa-99c1-11dd-bbfe-3dabce05a288

3rdparty/SoundTouch/CMakeLists.txt

@@ -4,7 +4,6 @@
 set(SoundTouchName pcsx2_SoundTouch)
 
 set(CommonFlags
-    -m32
     -march=athlon-xp
     -march=prescott
     )
@@ -61,6 +60,3 @@ set(SoundTouchHeaders
 
 # add library
 add_library(${SoundTouchName} STATIC ${SoundTouchSources} ${SoundTouchHeaders})
-
-# Force the linker into 32 bits mode
-target_link_libraries(${SoundTouchName} -m32)

3rdparty/bzip2/CMakeLists.txt

@@ -4,7 +4,6 @@
 set(bzip2Name pcsx2_bzip2)
 
 set(CommonFlags
-    -m32
     -march=athlon-xp
     -march=prescott
     )
@@ -49,6 +48,3 @@ set(bzip2Headers
 
 # add library
 add_library(${bzip2Name} STATIC ${bzip2Sources} ${bzip2Headers})
-
-# Force the linker into 32 bits mode
-target_link_libraries(${bzip2Name} -m32)

3rdparty/liba52/CMakeLists.txt

@@ -5,7 +5,6 @@ set(a52Name pcsx2_a52)
 
 set(CommonFlags
     -Wall
-    -m32
     -g
     )
 
@@ -54,6 +53,3 @@ set(a52Headers
 
 # add library
 add_library(${a52Name} STATIC ${a52Sources} ${a52Headers}) 
-
-# Force the linker into 32 bits mode
-target_link_libraries(${a52Name} -m32)

3rdparty/zlib/CMakeLists.txt

@@ -5,7 +5,6 @@ set(zlibName pcsx2_zlib)
 
 set(CommonFlags
     -W
-    -m32
     )
 
 set(OptimizationFlags
@@ -64,7 +63,3 @@ inftrees.h )
 
 # add library
 add_library(${zlibName} STATIC ${zlibSources} ${zlibHeaders})
-
-# Force the linker into 32 bits mode
-target_link_libraries(${zlibName} -m32)
-

CMakeLists.txt

@@ -36,7 +36,8 @@ endif(EXISTS "${PROJECT_SOURCE_DIR}/3rdparty")
 
 # make common
 if(common_libs)
-    add_subdirectory(common)
+    add_subdirectory(common/src/Utilities)
+    add_subdirectory(common/src/x86emitter)
 endif(common_libs)
 
 # make tools

cmake/BuildParameters.cmake

@@ -8,8 +8,36 @@
 ### Add some flags to the build process
 # control C flags             : -DUSER_CMAKE_C_FLAGS="cflags"
 # control C++ flags           : -DUSER_CMAKE_CXX_FLAGS="cxxflags"
+# control link flags          : -DUSER_CMAKE_LD_FLAGS="ldflags"
 #-------------------------------------------------------------------------------
 
+#-------------------------------------------------------------------------------
+# if no build type is set, use Devel as default
+# Note without the CMAKE_BUILD_TYPE options the value is still defined to ""
+# Ensure that the value set by the User is correct to avoid some bad behavior later
+#-------------------------------------------------------------------------------
+if(NOT CMAKE_BUILD_TYPE MATCHES "Debug|Devel|Release")
+	set(CMAKE_BUILD_TYPE Devel)
+	message(STATUS "BuildType set to ${CMAKE_BUILD_TYPE} by default")
+endif(NOT CMAKE_BUILD_TYPE MATCHES "Debug|Devel|Release")
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Set default strip option. Can be set with -DCMAKE_BUILD_STRIP=TRUE/FALSE
+#-------------------------------------------------------------------------------
+if(NOT DEFINED CMAKE_BUILD_STRIP)
+    if(CMAKE_BUILD_TYPE STREQUAL "Release")
+        set(CMAKE_BUILD_STRIP TRUE)
+        message(STATUS "Enable the stripping by default in ${CMAKE_BUILD_TYPE} build !!!")
+    else(CMAKE_BUILD_TYPE STREQUAL "Release")
+        set(CMAKE_BUILD_STRIP FALSE)
+        message(STATUS "Disable the stripping by default in ${CMAKE_BUILD_TYPE} build !!!")
+    endif(CMAKE_BUILD_TYPE STREQUAL "Release")
+endif(NOT DEFINED CMAKE_BUILD_STRIP)
+
+#-------------------------------------------------------------------------------
+# Control GCC flags
+#-------------------------------------------------------------------------------
 ### Cmake set default value for various compilation variable
 ### Here the list of default value for documentation purpose
 # ${CMAKE_SHARED_LIBRARY_CXX_FLAGS} = "-fPIC"
@@ -46,46 +74,46 @@ set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "")
 
 #-------------------------------------------------------------------------------
 # Allow user to set some default flags
-# By default do not use any flags
+# Note: string STRIP must be used to remove trailing and leading spaces.
+#       See policy CMP0004
 #-------------------------------------------------------------------------------
+### linker flags
+if(DEFINED USER_CMAKE_LD_FLAGS)
+    message(STATUS "Pcsx2 is very sensible with gcc flags, so use USER_CMAKE_LD_FLAGS at your own risk !!!")
+    string(STRIP "${USER_CMAKE_LD_FLAGS}" USER_CMAKE_LD_FLAGS)
+else(DEFINED USER_CMAKE_LD_FLAGS)
+    set(USER_CMAKE_LD_FLAGS "")
+endif(DEFINED USER_CMAKE_LD_FLAGS)
+
+# ask the linker to strip the binary
+if(CMAKE_BUILD_STRIP) 
+    string(STRIP "${USER_CMAKE_LD_FLAGS} -s" USER_CMAKE_LD_FLAGS)
+endif(CMAKE_BUILD_STRIP) 
+
+
+### c flags
+# Note CMAKE_C_FLAGS is also send to the linker.
+# By default allow build on amd64 machine
 if(DEFINED USER_CMAKE_C_FLAGS)
     message(STATUS "Pcsx2 is very sensible with gcc flags, so use USER_CMAKE_C_FLAGS at your own risk !!!")
-    set(CMAKE_C_FLAGS "${USER_CMAKE_C_FLAGS}")
+    string(STRIP "${USER_CMAKE_C_FLAGS} ${USER_CMAKE_LD_FLAGS} -m32" CMAKE_C_FLAGS)
 else(DEFINED USER_CMAKE_C_FLAGS)
-    set(CMAKE_C_FLAGS "")
+    string(STRIP "${USER_CMAKE_LD_FLAGS} -m32" CMAKE_C_FLAGS)
 endif(DEFINED USER_CMAKE_C_FLAGS)
 
+
+### C++ flags
+# Note CMAKE_CXX_FLAGS is also send to the linker.
+# By default allow build on amd64 machine
 if(DEFINED USER_CMAKE_CXX_FLAGS)
     message(STATUS "Pcsx2 is very sensible with gcc flags, so use USER_CMAKE_CXX_FLAGS at your own risk !!!")
-    set(CMAKE_CXX_FLAGS "${USER_CMAKE_CXX_FLAGS}")
+    string(STRIP "${USER_CMAKE_CXX_FLAGS}" CMAKE_CXX_FLAGS)
+    string(STRIP "${USER_CMAKE_CXX_FLAGS} ${USER_CMAKE_LD_FLAGS} -m32" CMAKE_CXX_FLAGS)
 else(DEFINED USER_CMAKE_CXX_FLAGS)
     set(CMAKE_CXX_FLAGS "")
+    string(STRIP "${USER_CMAKE_LD_FLAGS} -m32" CMAKE_CXX_FLAGS)
 endif(DEFINED USER_CMAKE_CXX_FLAGS)
 
-#-------------------------------------------------------------------------------
-# if no build type is set, use Devel as default
-# Note without the CMAKE_BUILD_TYPE options the value is still defined to ""
-# Ensure that the value set by the User is correct to avoid some bad behavior later
-#-------------------------------------------------------------------------------
-if(NOT CMAKE_BUILD_TYPE MATCHES "Debug|Devel|Release")
-	set(CMAKE_BUILD_TYPE Devel)
-	message(STATUS "BuildType set to ${CMAKE_BUILD_TYPE} by default")
-endif(NOT CMAKE_BUILD_TYPE MATCHES "Debug|Devel|Release")
-#-------------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------------
-# Set default strip option. Can be set with -DCMAKE_BUILD_STRIP=TRUE/FALSE
-#-------------------------------------------------------------------------------
-if(NOT DEFINED CMAKE_BUILD_STRIP)
-    if(CMAKE_BUILD_TYPE STREQUAL "Release")
-        set(CMAKE_BUILD_STRIP TRUE)
-        message(STATUS "Enable the stripping by default in ${CMAKE_BUILD_TYPE} build !!!")
-    else(CMAKE_BUILD_TYPE STREQUAL "Release")
-        set(CMAKE_BUILD_STRIP FALSE)
-        message(STATUS "Disable the stripping by default in ${CMAKE_BUILD_TYPE} build !!!")
-    endif(CMAKE_BUILD_TYPE STREQUAL "Release")
-endif(NOT DEFINED CMAKE_BUILD_STRIP)
-
 #-------------------------------------------------------------------------------
 # Select library system vs 3rdparty
 #-------------------------------------------------------------------------------

common/CMakeLists.txt

@@ -1,5 +0,0 @@
-
-# src
-add_subdirectory(src)
-
-

common/build/Utilities/Utilities.cbp

@@ -64,8 +64,6 @@
 					<Add option="-DPCSX2_DEVBUILD" />
 					<Add option="-DPCSX2_DEVEL" />
 					<Add option="-DNDEBUG" />
-					<Add directory="../../include" />
-					<Add directory="../../include/Utilities" />
 				</Compiler>
 			</Target>
 			<Target title="Release">
@@ -110,8 +108,6 @@
 					<Add option="-ftree-vrp" />
 					<Add option="-ftree-pre" />
 					<Add option="-DNDEBUG" />
-					<Add directory="../../include" />
-					<Add directory="../../include/Utilities" />
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
@@ -134,6 +130,7 @@
 			<Add directory="../../include/Utilities" />
 			<Add directory="../../include" />
 			<Add directory="../../../3rdparty" />
+			<Add directory="../../src/Utilities" />
 		</Compiler>
 		<Unit filename="../../../3rdparty/google/dense_hash_map" />
 		<Unit filename="../../../3rdparty/google/dense_hash_set" />
@@ -208,10 +205,7 @@
 		<Unit filename="../../src/Utilities/wxGuiTools.cpp" />
 		<Unit filename="../../src/Utilities/wxHelpers.cpp" />
 		<Unit filename="../../src/Utilities/x86/MemcpyFast.S" />
-		<Unit filename="../../src/Utilities/x86/MemcpyFast.cpp">
+		<Unit filename="../../src/Utilities/x86/MemcpyVibes.cpp" />
-			<Option compile="0" />
-			<Option link="0" />
-		</Unit>
 		<Extensions>
 			<envvars />
 			<code_completion>

common/build/Utilities/utilities.vcproj

@@ -227,6 +227,10 @@
 				RelativePath="..\..\src\Utilities\x86\MemcpyFast.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\Utilities\x86\MemcpyVibes.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\Utilities\PathUtils.cpp"
 				>

common/include/Utilities/MemcpyFast.h

@@ -125,10 +125,14 @@
 // Only used in the Windows version of memzero.h. But it's in Misc.cpp for some reason.
 void _memset16_unaligned( void* dest, u16 data, size_t size );
 
+// MemcpyVibes.cpp functions
+extern void memcpy_vibes(void * dest, const void * src, int size);
+extern void gen_memcpy_vibes();
+
 #define memcpy_fast			memcpy_amd_  // Fast memcpy
 #define memcpy_aligned(d,s,c)	memcpy_amd_(d,s,c)	// Memcpy with 16-byte Aligned addresses
 #define memcpy_const		memcpy_amd_	 // Memcpy with constant size
 #define memcpy_constA		memcpy_amd_  // Memcpy with constant size and 16-byte aligned
-
+#define memcpy_qwc_			memcpy_vibes // Memcpy in aligned qwc increments, with 0x400 qwc or less
 #define memcpy_qwc(d,s,c)		memcpy_amd_qwc(d,s,c)
 //#define memcpy_qwc(d,s,c)		memcpy_amd_(d,s,c*16)

common/include/Utilities/win_memzero.h

@@ -73,6 +73,10 @@ static __forceinline void memzero_ptr( void *dest )
 		return;
 	}
 
+#if 0
+	// SSE-based memory clear.  Currently disabled so to avoid unnecessary dependence on
+	// SSE cpu instruction sets.  (memzero typically isn't used in any performance critical
+	// situations anyway)
 	enum
 	{
 		remainder = MZFbytes & 127,
@@ -86,8 +90,6 @@ static __forceinline void memzero_ptr( void *dest )
 
 	if( (MZFbytes & 0xf) == 0 )
 	{
-		u64 _xmm_backup[2];
-
 		if( ((uptr)dest & 0xf) != 0 )
 		{
 			// UNALIGNED COPY MODE.
@@ -97,24 +99,21 @@ static __forceinline void memzero_ptr( void *dest )
 			{
 				__asm
 				{
-					movups _xmm_backup,xmm0;
 					mov ecx,dest
 					pxor xmm0,xmm0
 					mov eax,bytes128
 
-					align 16
-
 				_loop_6:
-					movups [ecx],xmm0;
+					movups [ecx],xmm0
-					movups [ecx+0x10],xmm0;
+					movups [ecx+0x10],xmm0
-					movups [ecx+0x20],xmm0;
+					movups [ecx+0x20],xmm0
-					movups [ecx+0x30],xmm0;
+					movups [ecx+0x30],xmm0
-					movups [ecx+0x40],xmm0;
+					movups [ecx+0x40],xmm0
-					movups [ecx+0x50],xmm0;
+					movups [ecx+0x50],xmm0
-					movups [ecx+0x60],xmm0;
+					movups [ecx+0x60],xmm0
-					movups [ecx+0x70],xmm0;
+					movups [ecx+0x70],xmm0
 					sub ecx,-128
-					dec eax;
+					sub eax,1
 					jnz _loop_6;
 				}
 				if( remainder != 0 )
@@ -130,10 +129,6 @@ static __forceinline void memzero_ptr( void *dest )
 						jnz _loop_5;
 					}
 				}
-				__asm
-				{
-					movups xmm0,[_xmm_backup];
-				}
 				return;
 			}
 		}
@@ -145,24 +140,21 @@ static __forceinline void memzero_ptr( void *dest )
 
 			__asm
 			{
-				movups _xmm_backup,xmm0;
 				mov ecx,dest
 				pxor xmm0,xmm0
 				mov eax,bytes128
 
-				align 16
-
 			_loop_8:
-				movaps [ecx],xmm0;
+				movaps [ecx],xmm0
-				movaps [ecx+0x10],xmm0;
+				movaps [ecx+0x10],xmm0
-				movaps [ecx+0x20],xmm0;
+				movaps [ecx+0x20],xmm0
-				movaps [ecx+0x30],xmm0;
+				movaps [ecx+0x30],xmm0
-				movaps [ecx+0x40],xmm0;
+				movaps [ecx+0x40],xmm0
-				movaps [ecx+0x50],xmm0;
+				movaps [ecx+0x50],xmm0
-				movaps [ecx+0x60],xmm0;
+				movaps [ecx+0x60],xmm0
-				movaps [ecx+0x70],xmm0;
+				movaps [ecx+0x70],xmm0
 				sub ecx,-128
-				dec eax;
+				sub eax,1
 				jnz _loop_8;
 			}
 			if( remainder != 0 )
@@ -173,18 +165,15 @@ static __forceinline void memzero_ptr( void *dest )
 					mov eax, remainder
 
 				_loop_10:
-					movaps [ecx+eax],xmm0;
+					movaps [ecx+eax],xmm0
 					sub eax,16;
 					jnz _loop_10;
 				}
 			}
-			__asm
-			{
-				movups xmm0,[_xmm_backup];
-			}
 			return;
 		}
 	}
+	#endif
 
 	// This function only works on 32-bit alignments.
 	pxAssume( (MZFbytes & 0x3) == 0 );
@@ -271,8 +260,6 @@ static __forceinline void memset_8( void *dest )
 		return;
 	}
 
-	//u64 _xmm_backup[2];
-
 	/*static const size_t remainder = MZFbytes & 127;
 	static const size_t bytes128 = MZFbytes / 128;
 	if( bytes128 > 32 )
@@ -283,7 +270,6 @@ static __forceinline void memset_8( void *dest )
 
 		__asm
 		{
-			movups _xmm_backup,xmm0;
 			mov eax,bytes128
 			mov ecx,dest
 			movss xmm0,data
@@ -316,10 +302,6 @@ static __forceinline void memset_8( void *dest )
 				jnz _loop_10;
 			}
 		}
-		__asm
-		{
-			movups xmm0,[_xmm_backup];
-		}
 	}*/
 
 	// This function only works on 32-bit alignments of data copied.

common/include/x86emitter/x86types.h

@@ -16,9 +16,9 @@
 #pragma once
 
 // Register counts for x86/32 mode:
-static const int iREGCNT_XMM = 8;
+static const uint iREGCNT_XMM = 8;
-static const int iREGCNT_GPR = 8;
+static const uint iREGCNT_GPR = 8;
-static const int iREGCNT_MMX = 8;
+static const uint iREGCNT_MMX = 8;
 
 enum XMMSSEType
 {

common/src/CMakeLists.txt

@@ -1,13 +0,0 @@
-# Check that people use the good file
-if(NOT TOP_CMAKE_WAS_SOURCED)
-    message(FATAL_ERROR "
-    You did not 'cmake' the good CMakeLists.txt file. Use the one in the top dir.
-    It is advice to delete all wrongly generated cmake stuff => CMakeFiles & CMakeCache.txt")
-endif(NOT TOP_CMAKE_WAS_SOURCED)
-
-
-# make Utilities
-add_subdirectory(Utilities)
-
-# make x86emitter
-add_subdirectory(x86emitter)

common/src/Utilities/CMakeLists.txt

@@ -12,7 +12,6 @@ set(UtilitiesName Utilities)
 # set common flags
 set(CommonFlags 
 	-pthread
-	-m32
 	-march=i486
 	-msse
 	-msse2
@@ -124,6 +123,7 @@ set(UtilitiesSources
 	wxAppWithHelpers.cpp
 	wxGuiTools.cpp
 	wxHelpers.cpp
+	x86/MemcpyVibes.cpp
 #	x86/MemcpyFast.cpp
 	)
 
@@ -160,6 +160,8 @@ set(UtilitiesHeaders
 	../../include/Utilities/wxGuiTools.h
 	PrecompiledHeader.h)
 
+include_directories(.)
+
 # change language of .S-files to c++
 set_source_files_properties(${UtilitiesSSources} PROPERTIES LANGUAGE CXX)
 
@@ -168,11 +170,3 @@ add_library(${UtilitiesName} STATIC ${UtilitiesSources} ${UtilitiesHeaders} ${Ut
 
 # link target with wx
 target_link_libraries(${UtilitiesName} ${wxWidgets_LIBRARIES})
- 
-# Force the linker into 32 bits mode
-target_link_libraries(${UtilitiesName} -m32)
-
-# Linker strip option
-if (CMAKE_BUILD_STRIP)
-    target_link_libraries(${UtilitiesName} -s)
-endif (CMAKE_BUILD_STRIP)

common/src/Utilities/x86/MemcpyVibes.cpp

@@ -0,0 +1,158 @@
+/*  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 <http://www.gnu.org/licenses/>.
+ */
+
+#include "PrecompiledHeader.h"
+#include "x86emitter/x86emitter.h"
+#include <xmmintrin.h>
+
+using namespace x86Emitter;
+
+// Max Number of qwc supported
+#define _maxSize 0x400
+
+typedef void (__fastcall *_memCpyCall)(void*, void*);
+__aligned16 _memCpyCall _memcpy_vibes[_maxSize+1];
+
+#if 1
+
+// this version uses SSE intrinsics to perform an inline copy.  MSVC disasm shows pretty
+// decent code generation on whole, but it hasn't been benchmarked at all yet --air
+__forceinline void memcpy_vibes(void * dest, const void * src, int size) {
+
+	float (*destxmm)[4] = (float(*)[4])dest, (*srcxmm)[4] = (float(*)[4])src;
+	size_t count = size & ~15, extra = size & 15;
+
+	destxmm -= 8 - extra, srcxmm -= 8 - extra;
+	switch (extra) {
+		do {
+			destxmm += 16, srcxmm += 16, count -= 16;
+			_mm_store_ps(&destxmm[-8][0], _mm_load_ps(&srcxmm[-8][0]));
+			case 15:
+				_mm_store_ps(&destxmm[-7][0], _mm_load_ps(&srcxmm[-7][0]));
+			case 14:
+				_mm_store_ps(&destxmm[-6][0], _mm_load_ps(&srcxmm[-6][0]));
+			case 13:
+				_mm_store_ps(&destxmm[-5][0], _mm_load_ps(&srcxmm[-5][0]));
+			case 12:
+				_mm_store_ps(&destxmm[-4][0], _mm_load_ps(&srcxmm[-4][0]));
+			case 11:
+				_mm_store_ps(&destxmm[-3][0], _mm_load_ps(&srcxmm[-3][0]));
+			case 10:
+				_mm_store_ps(&destxmm[-2][0], _mm_load_ps(&srcxmm[-2][0]));
+			case  9:
+				_mm_store_ps(&destxmm[-1][0], _mm_load_ps(&srcxmm[-1][0]));
+			case  8:
+				_mm_store_ps(&destxmm[ 0][0], _mm_load_ps(&srcxmm[ 0][0]));
+			case  7:
+				_mm_store_ps(&destxmm[ 1][0], _mm_load_ps(&srcxmm[ 1][0]));
+			case  6:
+				_mm_store_ps(&destxmm[ 2][0], _mm_load_ps(&srcxmm[ 2][0]));
+			case  5:
+				_mm_store_ps(&destxmm[ 3][0], _mm_load_ps(&srcxmm[ 3][0]));
+			case  4:
+				_mm_store_ps(&destxmm[ 4][0], _mm_load_ps(&srcxmm[ 4][0]));
+			case  3:
+				_mm_store_ps(&destxmm[ 5][0], _mm_load_ps(&srcxmm[ 5][0]));
+			case  2:
+				_mm_store_ps(&destxmm[ 6][0], _mm_load_ps(&srcxmm[ 6][0]));
+			case  1:
+				_mm_store_ps(&destxmm[ 7][0], _mm_load_ps(&srcxmm[ 7][0]));
+			case  0: NULL;
+		} while (count);
+	}
+}
+
+#else
+#if 1
+// This version creates one function with a lot of movaps
+// It jumps to the correct movaps entry-point while adding
+// the proper offset for adjustment...
+
+static __pagealigned u8   _memCpyExec[__pagesize*16];
+
+void gen_memcpy_vibes() {
+	HostSys::MemProtectStatic(_memCpyExec, Protect_ReadWrite, false);
+	memset (_memCpyExec, 0xcc, sizeof(_memCpyExec));
+	xSetPtr(_memCpyExec);
+
+	int off =-(((_maxSize & 0xf) - 7) << 4);
+	for (int i = _maxSize, x = 0; i > 0; i--, x=(x+1)&7, off+=16) {
+
+		_memcpy_vibes[i] = (_memCpyCall)xGetPtr();
+
+		if (off >=  128) {
+			off  = -128;
+			xADD(edx, 256);
+			xADD(ecx, 256);
+		}
+		const xRegisterSSE xmm_t(x);
+		xMOVAPS(xmm_t, ptr32[edx+off]);
+		xMOVAPS(ptr32[ecx+off], xmm_t);
+	}
+
+	_memcpy_vibes[0] = (_memCpyCall)xGetPtr();
+
+	xRET();
+	pxAssert(((uptr)xGetPtr() - (uptr)_memCpyExec) < sizeof(_memCpyExec));
+
+	HostSys::MemProtectStatic(_memCpyExec, Protect_ReadOnly, true);
+}
+
+__forceinline void memcpy_vibes(void * dest, const void * src, int size) {
+	int offset = ((size & 0xf) - 7) << 4;
+	_memcpy_vibes[size]((void*)((uptr)dest + offset), (void*)((uptr)src + offset));
+}
+
+#else
+
+// This version creates '_maxSize' number of different functions,
+// and calls the appropriate one...
+
+static __pagealigned u8   _memCpyExec[__pagesize*_maxSize*2];
+
+void gen_memcpy_vibes() {
+	HostSys::MemProtectStatic(_memCpyExec, Protect_ReadWrite, false);
+	memset (_memCpyExec, 0xcc, sizeof(_memCpyExec));
+	xSetPtr(_memCpyExec);
+
+	for (int i = 0; i < _maxSize+1; i++) 
+	{
+		int off = 0;
+		_memcpy_vibes[i] = (_memCpyCall)xGetAlignedCallTarget();
+
+		for (int j = 0, x = 0; j < i; j++, x=(x+1)&7, off+=16) {
+			if (off >=  128) {
+				off  = -128;
+				xADD(edx, 256);
+				xADD(ecx, 256);
+			}
+			const xRegisterSSE xmm_t(x);
+			xMOVAPS(xmm_t, ptr32[edx+off]);
+			xMOVAPS(ptr32[ecx+off], xmm_t);
+		}
+
+		xRET();
+		pxAssert(((uptr)xGetPtr() - (uptr)_memCpyExec) < sizeof(_memCpyExec));
+	}
+
+	HostSys::MemProtectStatic(_memCpyExec, Protect_ReadOnly, true);
+}
+
+__forceinline void memcpy_vibes(void * dest, const void * src, int size) {
+	_memcpy_vibes[size](dest, src);
+}
+
+#endif
+#endif

common/src/x86emitter/CMakeLists.txt

@@ -16,7 +16,6 @@ set(CommonFlags
 	-fno-dse
 	-fno-tree-dse
 	-fno-strict-aliasing
-	-m32
 	-march=i486
 	-msse
 	-msse2
@@ -144,11 +143,3 @@ add_library(${x86emitterName} STATIC ${x86emitterSources} ${x86emitterHeaders})
 
 # link target with wx
 target_link_libraries(${x86emitterName} ${wxWidgets_LIBRARIES})
-
-# Force the linker into 32 bits mode
-target_link_libraries(${x86emitterName} -m32)
-
-# Linker strip option
-if (CMAKE_BUILD_STRIP)
-    target_link_libraries(${x86emitterName} -s)
-endif (CMAKE_BUILD_STRIP)

debian-unstable-upstream/control

@@ -4,24 +4,24 @@ Priority: optional
 Maintainer: Gregory Hainaut <gregory.hainaut@gmail.com>
 Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.5.6), cmake (>=2.8),
     gcc-multilib [amd64], g++-multilib [amd64],
-    zlib1g-dev (>=1:1.2.3.3) | lib32z1-dev (>=1.2.3.3) [amd64],
+    zlib1g-dev (>= 1:1.2.3.3) | lib32z1-dev (>= 1.2.3.3) [amd64],
     libbz2-dev (>= 1.0.4),
     libsdl1.2-dev,
     libjpeg-dev,
-    libwxbase2.8-dev (>=2.8.0),
+    libwxbase2.8-dev (>= 2.8.10), libwxbase2.8-dev (<< 2.8.11), 
-    libwxgtk2.8-dev (>=2.8.0),
+    libwxgtk2.8-dev (>= 2.8.10), libwxgtk2.8-dev (<< 2.8.11),
-    libgtk2.0-dev (>=2.10),
+    libgtk2.0-dev (>= 2.16),
     liba52-0.7.4-dev,
-    libasound2-dev | lib32asound2 [amd64],
+    libasound2-dev | lib32asound2-dev [amd64],
     portaudio19-dev,
 # version not yet in debian 
 # libsoundtouch1-dev (>= 1.5),
 # I patch the source (remove feature) to compile with version 1.3
     libsoundtouch1-dev (>= 1.3),
-    libsparsehash-dev (>=1.6),
+    libsparsehash-dev (>= 1.6),
     libx11-dev,
     libxxf86vm-dev,
-    libglew1.5-dev (>=1.5.1),
+    libglew1.5-dev (>= 1.5.1),
     libgl1-mesa-dev,
     libglu1-mesa-dev,
 # my nmu: add 32bits packages
@@ -68,7 +68,9 @@ Package: pcsx2-plugins-unstable
 # Warning amd64 need additional ia32libs
 Architecture: i386 amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: pcsx2-unstable (>= ${binary:Version}), pcsx2-data-unstable (>= ${binary:Version})
+Recommends: pcsx2-unstable (>= ${binary:Version}), pcsx2-data-unstable (>= ${binary:Version}),
+# manually add nvidia-cg-toolkit for zzogl. Do not why is not found by shlibs !!!
+    nvidia-cg-toolkit-pcsx2 | nvidia-cg-toolkit (>= 2.1), ia32-nvidia-cg-toolkit-pcsx2 [amd64]
 Conflicts: pcsx2-plugins
 Description: Various plugins for pcsx2
  PCSX2 is a PlayStation 2 emulator for Windows and

debian-unstable-upstream/control_ppa

@@ -3,13 +3,13 @@ Section: games
 Priority: optional
 Maintainer: Gregory Hainaut <gregory.hainaut@gmail.com>
 Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.5.6), cmake (>=2.8),
-    zlib1g-dev (>=1:1.2.3.3),
+    zlib1g-dev (>= 1:1.2.3.3),
     libbz2-dev (>= 1.0.4),
     libsdl1.2-dev,
     libjpeg-dev,
-    libwxbase2.8-dev (>=2.8.0),
+    libwxbase2.8-dev (>= 2.8.10), libwxbase2.8-dev (<< 2.8.11), 
-    libwxgtk2.8-dev (>=2.8.0),
+    libwxgtk2.8-dev (>= 2.8.10), libwxgtk2.8-dev (<< 2.8.11),
-    libgtk2.0-dev (>=2.10),
+    libgtk2.0-dev (>= 2.16),
     liba52-0.7.4-dev,
     libasound2-dev,
     portaudio19-dev,
@@ -17,10 +17,10 @@ Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.5.6), cmake (>=2.8),
 # libsoundtouch1-dev (>= 1.5),
 # I patch the source (remove feature) to compile with version 1.3
     libsoundtouch1-dev (>= 1.3),
-    libsparsehash-dev (>=1.6),
+    libsparsehash-dev (>= 1.6),
     libx11-dev,
     libxxf86vm-dev,
-    libglew1.5-dev (>=1.5.1),
+    libglew1.5-dev (>= 1.5.1),
     libgl1-mesa-dev,
     libglu1-mesa-dev,
     nvidia-cg-toolkit-pcsx2
@@ -62,7 +62,9 @@ Description: data for pcsx2
 Package: pcsx2-plugins-unstable
 Architecture: i386
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: pcsx2-unstable (>= ${binary:Version}), pcsx2-data-unstable (>= ${binary:Version})
+Recommends: pcsx2-unstable (>= ${binary:Version}), pcsx2-data-unstable (>= ${binary:Version}),
+# manually add nvidia-cg-toolkit for zzogl. Do not why is not found by shlibs !!!
+    nvidia-cg-toolkit-pcsx2 | nvidia-cg-toolkit (>= 2.1)
 Conflicts: pcsx2-plugins
 Description: Various plugins for pcsx2
  PCSX2 is a PlayStation 2 emulator for Windows and

debian-unstable-upstream/copyright

@@ -34,7 +34,7 @@ On Debian systems, the complete text of the GNU Lesser General
 Public License version 3 can be found in "/usr/share/common-licenses/LGPL-3".
 
 
-Files: pcsx2/Mdec.cpp, pcsx2/Mdec.h, pcsx2/RDebug/deci2_drfp.cpp, pcsx2/IPU/mpeg2lib/*, pcsx2/cheatscpp.h, common/include/api/*, plugins/onepad/*, plugins/PadNull/Linux/*, plugins/SPU2null/*, plugins/FWnull/FW.cpp, plugins/zerospu2/*, plugins/CDVDnull/Linux/*, plugins/zzogl-pg/*, plugins/GSnull/Registers.h, plugins/GSnull/Linux/Linux*, plugins/GSnull/Linux/Config*, plugins/dev9null/DEV9.h, plugins/dev9null/Config.*
+Files: pcsx2/Mdec.cpp, pcsx2/Mdec.h, pcsx2/RDebug/deci2_drfp.cpp, pcsx2/IPU/mpeg2lib/*, pcsx2/cheatscpp.h, common/include/api/*, plugins/onepad/*, plugins/PadNull/Linux/*, plugins/SPU2null/*, plugins/FWnull/FW.cpp, plugins/zerospu2/*, plugins/zzogl-pg/*, plugins/GSnull/Registers.h, plugins/GSnull/Linux/Linux*, plugins/GSnull/Linux/Config*, plugins/dev9null/DEV9.h, plugins/dev9null/Config.*
 License: GPL-2+
 
     This program is free software: you can redistribute it and/or modify

debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh

@@ -115,8 +115,6 @@ find $NEW_DIR -name "configure.ac" -exec rm -f {} \;
 find $NEW_DIR -name "Makefile.am" -exec rm -f {} \;
 echo "Remove 3rd party directory"
 find $NEW_DIR -name "3rdparty" -exec rm -fr {} \; 2> /dev/null
-# echo "Remove plugins/zzogl-pg/opengl/ZeroGSShaders (some zlib source in the middle)"
-# rm -fr $NEW_DIR/plugins/zzogl-pg/opengl/ZeroGSShaders
 echo "Remove windows file (useless & copyright issue)"
 find $NEW_DIR -iname "windows" -exec rm -fr {} \; 2> /dev/null
 rm -fr "${NEW_DIR}/plugins/zzogl-pg/opengl/Win32"
@@ -125,6 +123,7 @@ rm -fr "${NEW_DIR}/common/vsprops"
 echo "Remove useless file (copyright issue)"
 rm -fr "${NEW_DIR}/plugins/zzogl-pg/opengl/ZeroGSShaders/zlib"
 rm -fr "${NEW_DIR}/common/src/Utilities/x86/MemcpyFast.cpp"
+rm -fr "${NEW_DIR}/plugins/CDVDnull/Linux"
 
 
 ## BUILD

pcsx2/CMakeLists.txt

@@ -13,7 +13,6 @@ set(CommonFlags
 	-fno-dse
 	-fno-tree-dse
 	-fno-strict-aliasing
-	-m32
 	-march=i486
 	-msse
 	-msse2
@@ -642,11 +641,3 @@ endif(Linux)
 
 # link target with zlib
 target_link_libraries(${pcsx2Name} ${ZLIB_LIBRARIES})
-
-# Force the linker into 32 bits mode
-target_link_libraries(${pcsx2Name} -m32)
-
-# Linker strip option
-if (CMAKE_BUILD_STRIP)
-    target_link_libraries(${pcsx2Name} -s)
-endif (CMAKE_BUILD_STRIP)

pcsx2/IPU/IPU.cpp

@@ -1158,7 +1158,7 @@ void __fastcall ipu_csc(macroblock_8 *mb8, macroblock_rgb32 *rgb32, int sgn)
 	int i;
 	u8* p = (u8*)rgb32;
 
-	yuv2rgb_sse2();
+	yuv2rgb();
 
 	if (s_thresh[0] > 0)
 	{

pcsx2/IPU/yuv2rgb.cpp

@@ -23,10 +23,38 @@
 #include "IPU.h"
 #include "yuv2rgb.h"
 
+#define IPU_Y_BIAS 16
+#define IPU_C_BIAS 128
+#define IPU_Y_COEFF 0x95	//  1.1640625
+#define IPU_GCR_COEFF -0x68	// -0.8125
+#define IPU_GCB_COEFF -0x32	// -0.390625
+#define IPU_RCR_COEFF 0xcc	//  1.59375
+#define IPU_BCB_COEFF 0x102	//  2.015625
+
+// conforming implementation for reference, do not optimise
+void yuv2rgb_reference(void)
+{
+	for (int y = 0; y < 16; y++)
+		for (int x = 0; x < 16; x++)
+		{
+			s32 lum = (IPU_Y_COEFF * (max(0, (s32)mb8.Y[y][x] - IPU_Y_BIAS))) >> 6;
+			s32 rcr = (IPU_RCR_COEFF * ((s32)mb8.Cr[y>>1][x>>1] - 128)) >> 6;
+			s32 gcr = (IPU_GCR_COEFF * ((s32)mb8.Cr[y>>1][x>>1] - 128)) >> 6;
+			s32 gcb = (IPU_GCB_COEFF * ((s32)mb8.Cb[y>>1][x>>1] - 128)) >> 6;
+			s32 bcb = (IPU_BCB_COEFF * ((s32)mb8.Cb[y>>1][x>>1] - 128)) >> 6;
+
+			rgb32.c[y][x].r = max(0, min(255, (lum + rcr + 1) >> 1));
+			rgb32.c[y][x].g = max(0, min(255, (lum + gcr + gcb + 1) >> 1));
+			rgb32.c[y][x].b = max(0, min(255, (lum + bcb + 1) >> 1));
+			rgb32.c[y][x].a = 0x80; // the norm to save doing this on the alpha pass
+		}
+}
+
 // Everything below is bit accurate to the IPU specification (except maybe rounding).
 // Know the specification before you touch it.
-#define SSE_COEFFICIENTS(x) \
+#define SSE_BYTES(x) {x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x}
-	{(x)<<2,(x)<<2,(x)<<2,(x)<<2,(x)<<2,(x)<<2,(x)<<2,(x)<<2}
+#define SSE_WORDS(x) {x, x, x, x, x, x, x, x}
+#define SSE_COEFFICIENTS(x) SSE_WORDS((x)<<2)
 
 struct SSE2_Tables
 {
@@ -58,19 +86,19 @@ enum
 
 static const __aligned16 SSE2_Tables sse2_tables =
 {
-	{0x8000,0x8000,0x8000,0x8000,0x8000,0x8000,0x8000,0x8000},	// c_bias
+	SSE_WORDS(0x8000),		// c_bias
-	{16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16},			// y_bias
+	SSE_BYTES(IPU_Y_BIAS),	// y_bias
-	{0xff00,0xff00,0xff00,0xff00,0xff00,0xff00,0xff00,0xff00},	// y_mask
+	SSE_WORDS(0xff00),		// y_mask
 
 	// Specifying round off instead of round down as everywhere else
 	// implies that this is right
-	{1,1,1,1,1,1,1,1},		// round_1bit
+	SSE_WORDS(1),		// round_1bit
 
-	SSE_COEFFICIENTS(0x95),   // 1.1640625 [Y_coefficients]
+	SSE_COEFFICIENTS(IPU_Y_COEFF),
-	SSE_COEFFICIENTS(-0x68),  // -0.8125 [GCr_coefficients]
+	SSE_COEFFICIENTS(IPU_GCR_COEFF),
-	SSE_COEFFICIENTS(-0x32),  // -0.390625 [GCb_coefficients]
+	SSE_COEFFICIENTS(IPU_GCB_COEFF),
-	SSE_COEFFICIENTS(0xcc),   // 1.59375 [RCr_coefficients]
+	SSE_COEFFICIENTS(IPU_RCR_COEFF),
-	SSE_COEFFICIENTS(0x102),  // 2.015625 [BCb_coefficients]
+	SSE_COEFFICIENTS(IPU_BCB_COEFF),
 };
 
 static __aligned16 u16 yuv2rgb_temp[3][8];

pcsx2/IPU/yuv2rgb.h

@@ -15,5 +15,8 @@
 
 #pragma once
 
+#define yuv2rgb yuv2rgb_sse2
+
+extern void yuv2rgb_reference(void);
 extern void yuv2rgb_sse2(void);
 extern void yuv2rgb_init(void);

pcsx2/missing

@@ -1,360 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2005-06-08.21
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-#   Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# 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 this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case "$1" in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).
-case "$1" in
-  lex|yacc)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f y.tab.h ]; then
-	echo >y.tab.h
-    fi
-    if [ ! -f y.tab.c ]; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f lex.yy.c ]; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  tar)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case "$firstarg" in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case "$firstarg" in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-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:

pcsx2/ps2/GIFpath.cpp

@@ -257,7 +257,7 @@ __forceinline void GIFPath::Reset()
 
 __forceinline bool GIFPath::StepReg()
 {
-	if ((++curreg & 0xf) == tag.NREG) {
+	if (++curreg >= numregs) {
 		curreg = 0;
 		if (--nloop == 0) {
 			return false;

pcsx2/x86/microVU.cpp

@@ -106,6 +106,7 @@ _f void mVUinit(VURegs* vuRegsPtr, int vuIndex) {
 
 	// Allocates rec-cache and calls mVUreset()
 	mVUresizeCache(mVU, mVU->cacheSize + mVUcacheSafeZone);
+	//if (vuIndex) gen_memcpy_vibes();
 }
 
 // Resets Rec Data

plugins/CDVDiso/build.sh

@@ -1,34 +0,0 @@
-#!/bin/sh
-
-echo ----------------
-echo Building CDVDiso
-echo ----------------
-
-curdir=`pwd`
-
-
-if test "${CDVDisoOPTIONS+set}" != set ; then
-export CDVDisoOPTIONS=""
-fi
-
-cd src
-
-if [ $# -gt 0 ] && [ $1 = "all" ]
-then
-
-aclocal
-automake -a
-autoconf
-
-./configure ${CDVDisoOPTIONS} --prefix=${PCSX2PLUGINS}
-make clean
-make install
-
-else
-make $@
-fi
-
-if [ $? -ne 0 ]
-then
-exit 1
-fi

plugins/CDVDiso/src/CMakeLists.txt

@@ -11,7 +11,6 @@ set(CDVDisoName CDVDiso)
 
 set(CommonFlags
     -Wall
-    -m32
     -fpermissive
     )
 
@@ -80,11 +79,3 @@ set_target_properties(${CDVDisoName} PROPERTIES
 
 # Link with bz2
 target_link_libraries(${CDVDisoName} ${BZIP2_LIBRARIES})
-
-# Force the linker into 32 bits mode
-target_link_libraries(${CDVDisoName} -m32)
-
-# Linker strip option
-if (CMAKE_BUILD_STRIP)
-    target_link_libraries(${CDVDisoName} -s)
-endif (CMAKE_BUILD_STRIP)

plugins/CDVDiso/src/Makefile.am

@@ -1,31 +0,0 @@
-# Create a shared library libCDVDiso
-AUTOMAKE_OPTIONS = foreign
-noinst_LIBRARIES = libCDVDiso.a
-INCLUDES = $(shell pkg-config --cflags gtk+-2.0) -I@srcdir@/../../../common/include -I@srcdir@/../../../3rdparty -I@srcdir@/Linux -I../../../../3rdparty/zlib
-
-# Create a shared object by faking an exe (thanks to ODE makefiles)
-traplibdir=$(prefix)
- 
-if DEBUGBUILD
-preext=d
-endif
-
-EXEEXT=$(preext)@so_ext@
-
-traplib_PROGRAMS=libCDVDiso
-libCDVDiso_SOURCES=
-libCDVDiso_DEPENDENCIES = libCDVDiso.a
-libCDVDiso_LDFLAGS= @SHARED_LDFLAGS@
-libCDVDiso_LDFLAGS+=-Wl,-soname,@libCDVDiso_SONAME@
-libCDVDiso_LDADD=$(libCDVDiso_a_OBJECTS)
-
-libCDVDiso_a_SOURCES = CDVDisop.cpp CDVDiso.h libiso.cpp libiso.h mkiso/mkiso.cpp
-
-libCDVDiso_a_SOURCES += \
-Linux/Config.cpp Linux/Config.h Linux/Linux.cpp \
-Linux/interface.h Linux/support.c  \
-Linux/interface.c Linux/support.h \
-Linux/callbacks.h 
-#Linux/callbacks.c
-
-#SUBDIRS = Linux

plugins/CDVDiso/src/configure.ac

@@ -1,86 +0,0 @@
-AC_INIT(CDVDiso, 0.9,arcum42@gmail.com)
-
-AM_INIT_AUTOMAKE(CDVDiso,0.9)
-
-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++])
-
-AC_PROG_INSTALL
-AC_PROG_RANLIB
-
-dnl necessary for compiling assembly
-AM_PROG_AS
-
-AC_SUBST(CDVDiso_CURRENT, 0)
-AC_SUBST(CDVDiso_REVISION, 9)
-AC_SUBST(CDVDiso_AGE, 0)
-AC_SUBST(CDVDiso_RELEASE,[$CDVDiso_CURRENT].[$CDVDiso_REVISION].[$CDVDiso_AGE])
-AC_SUBST(CDVDiso_SONAME,libCDVDiso.so.[$CDVDiso_CURRENT].[$CDVDiso_REVISION].[$CDVDiso_AGE])
-
-CFLAGS= 
-CPPFLAGS= 
-CXXFLAGS= 
-CCASFLAGS=
-
-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(PCSX2_DEBUG,1,[PCSX2_DEBUG])
- CFLAGS+=" -g -fPIC -Wall  -Wno-unused-value -m32 "
- CPPFLAGS+=" -g -fPIC -Wall  -Wno-unused-value -m32 "
- CXXFLAGS+=" -g -fPIC -Wall  -Wno-unused-value -fpermissive -m32 "
- CCASFLAGS+=" -m32 "
-else
- AC_DEFINE(NDEBUG,1,[NDEBUG])
- CFLAGS+=" -O3 -fomit-frame-pointer -fPIC -Wno-unused-value -m32 "
- CPPFLAGS+=" -O3 -fomit-frame-pointer -fPIC -Wno-unused-value -m32 "
- CXXFLAGS+=" -O3 -fomit-frame-pointer -fPIC -Wno-unused-value -fpermissive -m32 "
- CCASFLAGS+=" -m32 "
-fi
-AM_CONDITIONAL(DEBUGBUILD, test x$debug = xyes)
-AC_MSG_RESULT($debug)
-
-AC_DEFINE(__LINUX__,1,[__LINUX__])
-AC_DEFINE(_FILE_OFFSET_BITS,64,[_FILE_OFFSET_BITS])
-
-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" == xyes
-then
- AC_DEFINE(CDVDiso_DEVBUILD,1,[CDVDiso_DEVBUILD])
-fi
-AC_MSG_RESULT($devbuild)
-AM_CONDITIONAL(RELEASE_TO_PUBLIC, test x$devbuild = xno)
-
-AC_CHECK_FUNCS([ _aligned_malloc _aligned_free ], AC_DEFINE(HAVE_ALIGNED_MALLOC))
-
-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.$CDVDiso_RELEASE"
-SHARED_LDFLAGS="-shared"
-AC_SUBST(so_ext)
-AC_SUBST(SHARED_LDFLAGS)
-
-AC_CHECK_LIB(stdc++,main,[LIBS="$LIBS -lstdc++"])
-AC_CHECK_LIB(z,main,[LIBS="$LIBS -lz"])
-AC_CHECK_LIB(bz2,main,[LIBS="$LIBS -lbz2"])
-
-AC_OUTPUT([
- Makefile
- ])
-
-echo "Configuration:"
-echo "  Debug build?	       $debug"
-echo "  Dev build?	       $devbuild"

plugins/CDVDiso/src/install-sh

@@ -1,519 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2006-12-25.00
-
-# 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.
-
-nl='
-'
-IFS=" ""	$nl"
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chgrpcmd=
-chmodcmd=$chmodprog
-chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
-stripcmd=
-
-src=
-dst=
-dir_arg=
-dst_arg=
-
-copy_on_change=false
-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:
-     --help     display this help and exit.
-     --version  display version info and exit.
-
-  -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
-  -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.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-  RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
-  case $1 in
-    -c) ;;
-
-    -C) copy_on_change=true;;
-
-    -d) dir_arg=true;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-	shift;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
-
-    -o) chowncmd="$chownprog $2"
-	shift;;
-
-    -s) stripcmd=$stripprog;;
-
-    -t) dst_arg=$2
-	shift;;
-
-    -T) no_target_directory=true;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    --)	shift
-	break;;
-
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
-
-    *)  break;;
-  esac
-  shift
-done
-
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-  # When -d is used, all remaining arguments are directories to create.
-  # When -t is used, the destination is already specified.
-  # Otherwise, the last argument is the destination.  Remove it from $@.
-  for arg
-  do
-    if test -n "$dst_arg"; then
-      # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dst_arg"
-      shift # fnord
-    fi
-    shift # arg
-    dst_arg=$arg
-  done
-fi
-
-if test $# -eq 0; 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
-
-if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
-
-  # Set umask so as not to create temps with too-generous modes.
-  # However, 'strip' requires both read and write access to temps.
-  case $mode in
-    # Optimize common cases.
-    *644) cp_umask=133;;
-    *755) cp_umask=22;;
-
-    *[0-7])
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw='% 200'
-      fi
-      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-    *)
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw=,u+rw
-      fi
-      cp_umask=$mode$u_plus_rw;;
-  esac
-fi
-
-for src
-do
-  # Protect names starting with `-'.
-  case $src in
-    -*) src=./$src;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
-  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 "$dst_arg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-
-    dst=$dst_arg
-    # 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: $dst_arg: Is a directory" >&2
-	exit 1
-      fi
-      dstdir=$dst
-      dst=$dstdir/`basename "$src"`
-      dstdir_status=0
-    else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\).*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
-      test -d "$dstdir"
-      dstdir_status=$?
-    fi
-  fi
-
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
-    esac
-
-    if
-      $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-      )
-    then :
-    else
-
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
-      # or it failed possibly due to a race condition.  Create the
-      # directory the slow way, step by step, checking for races as we go.
-
-      case $dstdir in
-	/*) prefix='/';;
-	-*) prefix='./';;
-	*)  prefix='';;
-      esac
-
-      eval "$initialize_posix_glob"
-
-      oIFS=$IFS
-      IFS=/
-      $posix_glob set -f
-      set fnord $dstdir
-      shift
-      $posix_glob set +f
-      IFS=$oIFS
-
-      prefixes=
-
-      for d
-      do
-	test -z "$d" && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
-      done
-
-      if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
-      fi
-    fi
-  fi
-
-  if test -n "$dir_arg"; then
-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-  else
-
-    # 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
-
-    # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $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 $mode "$dsttmp"; } &&
-
-    # If -C, don't bother to copy if it wouldn't change the file.
-    if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
-       set X $old && old=:$2:$4:$5:$6 &&
-       set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
-       test "$old" = "$new" &&
-       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-    then
-      rm -f "$dsttmp"
-    else
-      # Rename the file to the real destination.
-      $doit $mvcmd -f "$dsttmp" "$dst" 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.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
-
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
-      }
-    fi || exit 1
-
-    trap '' 0
-  fi
-done
-
-# 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:

plugins/CDVDiso/src/missing

@@ -1,367 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2006-05-10.23
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-#   Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# 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 this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).
-case $1 in
-  lex|yacc)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $1 in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f y.tab.h; then
-	echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* \([^ ]*\) *$/\1/
-	  p
-	  q
-	}' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  tar)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-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:

plugins/CDVDlinuz/Src/CMakeLists.txt

@@ -5,7 +5,6 @@ set(CDVDlinuzName CDVDlinuz)
 
 set(CommonFlags
     -Wall
-    -m32
     -fPIC
     -D_LARGEFILE64_SOURCE
     )
@@ -92,11 +91,3 @@ add_library(${CDVDlinuzName} SHARED
 # set output directory
 set_target_properties(${CDVDlinuzName} PROPERTIES
     LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)
-
-# Set link flags
-target_link_libraries(${CDVDlinuzName} -m32)
-
-# Linker strip option
-if (CMAKE_BUILD_STRIP)
-    target_link_libraries(${CDVDlinuzName} -s)
-endif (CMAKE_BUILD_STRIP)

plugins/CDVDnull/CDVD.cpp

@@ -38,20 +38,6 @@ EXPORT_C_(u32) CALLBACK PS2EgetLibVersion2(u32 type)
 	return (version << 16) | (revision << 8) | build;
 }
 
-#ifdef _WIN32
-void SysMessage(const char *fmt, ...)
-{
-	va_list list;
-	char tmp[512];
-
-	va_start(list, fmt);
-	vsprintf(tmp, fmt, list);
-	va_end(list);
-
-	MessageBox(GetActiveWindow(), tmp, "CDVDnull Msg", MB_SETFOREGROUND | MB_OK);
-}
-#endif
-
 EXPORT_C_(s32) CDVDinit()
 {
 	return 0;

plugins/CDVDnull/CDVD.h

@@ -23,6 +23,7 @@
 
 #define CDVDdefs
 #include "PS2Edefs.h"
+#include "PS2Eext.h"
 
 #ifdef __LINUX__
 #include <gtk/gtk.h>

plugins/CDVDnull/CMakeLists.txt

@@ -11,7 +11,6 @@ set(CDVDnullName CDVDnull)
 
 set(CommonFlags
     -Wall
-    -m32
     )
 
 set(OptimizationFlags
@@ -45,20 +44,6 @@ set(CDVDnullSources
 set(CDVDnullHeaders
 	CDVD.h)
 
-# CDVDnull Linux sources
-set(CDVDnullLinuxSources
-	Linux/callbacks.c
-	Linux/Config.cpp
-	Linux/interface.c
-	Linux/support.c)
-
-# CDVDnull Linux headers
-set(CDVDnullLinuxHeaders
-	Linux/callbacks.h
-	Linux/Config.h
-	Linux/interface.h
-	Linux/support.h)
-
 # CDVDnull Windows sources
 set(CDVDnullWindowsSources
 	Windows/CDVDnull.def
@@ -75,18 +60,8 @@ include_directories(.)
 add_library(${CDVDnullName} SHARED
 			${CDVDnullSources}
 			${CDVDnullHeaders}
-			${CDVDnullLinuxSources}
+            )
-			${CDVDnullLinuxHeaders})
-
-# Force the linker into 32 bits mode
-target_link_libraries(${CDVDnullName} -m32)
-
-# Linker strip option
-if (CMAKE_BUILD_STRIP)
-    target_link_libraries(${CDVDnullName} -s)
-endif (CMAKE_BUILD_STRIP)
 
 # set output directory
 set_target_properties(${CDVDnullName} PROPERTIES
 					  LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)
-

plugins/CDVDnull/Linux/CDVDnull.cbp

@@ -48,20 +48,6 @@
 		</Linker>
 		<Unit filename="../CDVD.cpp" />
 		<Unit filename="../CDVD.h" />
-		<Unit filename="Config.cpp" />
-		<Unit filename="Config.h" />
-		<Unit filename="callbacks.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="callbacks.h" />
-		<Unit filename="interface.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="interface.h" />
-		<Unit filename="support.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="support.h" />
 		<Unit filename="../ReadMe.txt" />
 		<Extensions>
 			<code_completion />

plugins/CDVDnull/Linux/Config.cpp

@@ -1,78 +0,0 @@
-/*  CDVDnull
- *  Copyright (C) 2002-2009  Pcsx2 Team
- *
- *  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
- */
-
-#include "CDVD.h"
-
-#include <assert.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-GtkWidget *MsgDlg;
-
-void OnMsg_Ok()
-{
-	gtk_widget_destroy(MsgDlg);
-	gtk_main_quit();
-}
-
-void SysMessage(const char *fmt, ...)
-{
-	GtkWidget *Ok, *Txt;
-	GtkWidget *Box, *Box1;
-	va_list list;
-	char msg[512];
-
-	va_start(list, fmt);
-	vsprintf(msg, fmt, list);
-	va_end(list);
-
-	if (msg[strlen(msg)-1] == '\n') msg[strlen(msg)-1] = 0;
-
-	MsgDlg = gtk_window_new(GTK_WINDOW_POPUP);
-	gtk_window_set_position(GTK_WINDOW(MsgDlg), GTK_WIN_POS_CENTER);
-	gtk_window_set_title(GTK_WINDOW(MsgDlg), "CDVDnull Msg");
-	gtk_container_set_border_width(GTK_CONTAINER(MsgDlg), 5);
-
-	Box = gtk_vbox_new(5, 0);
-	gtk_container_add(GTK_CONTAINER(MsgDlg), Box);
-	gtk_widget_show(Box);
-
-	Txt = gtk_label_new(msg);
-
-	gtk_box_pack_start(GTK_BOX(Box), Txt, FALSE, FALSE, 5);
-	gtk_widget_show(Txt);
-
-	Box1 = gtk_hbutton_box_new();
-	gtk_box_pack_start(GTK_BOX(Box), Box1, FALSE, FALSE, 0);
-	gtk_widget_show(Box1);
-
-	Ok = gtk_button_new_with_label("Ok");
-	gtk_signal_connect(GTK_OBJECT(Ok), "clicked", GTK_SIGNAL_FUNC(OnMsg_Ok), NULL);
-	gtk_container_add(GTK_CONTAINER(Box1), Ok);
-	GTK_WIDGET_SET_FLAGS(Ok, GTK_CAN_DEFAULT);
-	gtk_widget_show(Ok);
-
-	gtk_widget_show(MsgDlg);
-
-	gtk_main();
-}
-
-void LoadConfig()
-{
-}

plugins/CDVDnull/Linux/Config.h

@@ -1,17 +0,0 @@
-/*  CDVDnull
- *  Copyright (C) 2002-2009  Pcsx2 Team
- *
- *  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
- */

plugins/CDVDnull/Linux/callbacks.c

@@ -1,34 +0,0 @@
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#include <gtk/gtk.h>
-
-#include "callbacks.h"
-#include "interface.h"
-#include "support.h"
-
-
-void
-OnConf_Ok                              (GtkButton       *button,
-                                        gpointer         user_data)
-{
-
-}
-
-
-void
-OnConf_Cancel                          (GtkButton       *button,
-                                        gpointer         user_data)
-{
-
-}
-
-
-void
-OnAbout_Ok                             (GtkButton       *button,
-                                        gpointer         user_data)
-{
-
-}
-

plugins/CDVDnull/Linux/callbacks.h

@@ -1,14 +0,0 @@
-#include <gtk/gtk.h>
-
-
-void
-OnConf_Ok                              (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-OnConf_Cancel                          (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-OnAbout_Ok                             (GtkButton       *button,
-                                        gpointer         user_data);

plugins/CDVDnull/Linux/interface.c

@@ -1,173 +0,0 @@
-/*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
- */
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdio.h>
-
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-
-#include "callbacks.h"
-#include "interface.h"
-#include "support.h"
-
-#define GLADE_HOOKUP_OBJECT(component,widget,name) \
-  g_object_set_data_full (G_OBJECT (component), name, \
-    gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref)
-
-#define GLADE_HOOKUP_OBJECT_NO_REF(component,widget,name) \
-  g_object_set_data (G_OBJECT (component), name, widget)
-
-GtkWidget*
-create_Config (void)
-{
-  GtkWidget *Config;
-  GtkWidget *vbox1;
-  GtkWidget *frame3;
-  GtkWidget *alignment1;
-  GtkWidget *check_logging;
-  GtkWidget *label15;
-  GtkWidget *hbuttonbox1;
-  GtkWidget *button1;
-  GtkWidget *button2;
-
-  Config = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_widget_set_name (Config, "Config");
-  gtk_container_set_border_width (GTK_CONTAINER (Config), 5);
-  gtk_window_set_title (GTK_WINDOW (Config), _("CDVDconfig"));
-
-  vbox1 = gtk_vbox_new (FALSE, 5);
-  gtk_widget_set_name (vbox1, "vbox1");
-  gtk_widget_show (vbox1);
-  gtk_container_add (GTK_CONTAINER (Config), vbox1);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox1), 5);
-
-  frame3 = gtk_frame_new (NULL);
-  gtk_widget_set_name (frame3, "frame3");
-  gtk_widget_show (frame3);
-  gtk_box_pack_start (GTK_BOX (vbox1), frame3, TRUE, TRUE, 0);
-  gtk_frame_set_shadow_type (GTK_FRAME (frame3), GTK_SHADOW_NONE);
-
-  alignment1 = gtk_alignment_new (0.5, 0.5, 1, 1);
-  gtk_widget_set_name (alignment1, "alignment1");
-  gtk_widget_show (alignment1);
-  gtk_container_add (GTK_CONTAINER (frame3), alignment1);
-  gtk_alignment_set_padding (GTK_ALIGNMENT (alignment1), 0, 0, 12, 0);
-
-  check_logging = gtk_check_button_new_with_mnemonic (_("Enable Logging"));
-  gtk_widget_set_name (check_logging, "check_logging");
-  gtk_widget_show (check_logging);
-  gtk_container_add (GTK_CONTAINER (alignment1), check_logging);
-
-  label15 = gtk_label_new (_("<b>Logging</b>"));
-  gtk_widget_set_name (label15, "label15");
-  gtk_widget_show (label15);
-  gtk_frame_set_label_widget (GTK_FRAME (frame3), label15);
-  gtk_label_set_use_markup (GTK_LABEL (label15), TRUE);
-
-  hbuttonbox1 = gtk_hbutton_box_new ();
-  gtk_widget_set_name (hbuttonbox1, "hbuttonbox1");
-  gtk_widget_show (hbuttonbox1);
-  gtk_box_pack_start (GTK_BOX (vbox1), hbuttonbox1, TRUE, TRUE, 0);
-  gtk_box_set_spacing (GTK_BOX (hbuttonbox1), 30);
-
-  button1 = gtk_button_new_with_mnemonic (_("Ok"));
-  gtk_widget_set_name (button1, "button1");
-  gtk_widget_show (button1);
-  gtk_container_add (GTK_CONTAINER (hbuttonbox1), button1);
-  GTK_WIDGET_SET_FLAGS (button1, GTK_CAN_DEFAULT);
-
-  button2 = gtk_button_new_with_mnemonic (_("Cancel"));
-  gtk_widget_set_name (button2, "button2");
-  gtk_widget_show (button2);
-  gtk_container_add (GTK_CONTAINER (hbuttonbox1), button2);
-  GTK_WIDGET_SET_FLAGS (button2, GTK_CAN_DEFAULT);
-
-  g_signal_connect ((gpointer) button1, "clicked",
-                    G_CALLBACK (OnConf_Ok),
-                    NULL);
-  g_signal_connect ((gpointer) button2, "clicked",
-                    G_CALLBACK (OnConf_Cancel),
-                    NULL);
-
-  /* Store pointers to all widgets, for use by lookup_widget(). */
-  GLADE_HOOKUP_OBJECT_NO_REF (Config, Config, "Config");
-  GLADE_HOOKUP_OBJECT (Config, vbox1, "vbox1");
-  GLADE_HOOKUP_OBJECT (Config, frame3, "frame3");
-  GLADE_HOOKUP_OBJECT (Config, alignment1, "alignment1");
-  GLADE_HOOKUP_OBJECT (Config, check_logging, "check_logging");
-  GLADE_HOOKUP_OBJECT (Config, label15, "label15");
-  GLADE_HOOKUP_OBJECT (Config, hbuttonbox1, "hbuttonbox1");
-  GLADE_HOOKUP_OBJECT (Config, button1, "button1");
-  GLADE_HOOKUP_OBJECT (Config, button2, "button2");
-
-  return Config;
-}
-
-GtkWidget*
-create_About (void)
-{
-  GtkWidget *About;
-  GtkWidget *vbox2;
-  GtkWidget *label2;
-  GtkWidget *label3;
-  GtkWidget *hbuttonbox2;
-  GtkWidget *button3;
-
-  About = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_widget_set_name (About, "About");
-  gtk_container_set_border_width (GTK_CONTAINER (About), 5);
-  gtk_window_set_title (GTK_WINDOW (About), _("CDVDabout"));
-
-  vbox2 = gtk_vbox_new (FALSE, 5);
-  gtk_widget_set_name (vbox2, "vbox2");
-  gtk_widget_show (vbox2);
-  gtk_container_add (GTK_CONTAINER (About), vbox2);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox2), 5);
-
-  label2 = gtk_label_new (_("CDVD Null Driver"));
-  gtk_widget_set_name (label2, "label2");
-  gtk_widget_show (label2);
-  gtk_box_pack_start (GTK_BOX (vbox2), label2, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label2), GTK_JUSTIFY_CENTER);
-
-  label3 = gtk_label_new (_("Original Author: (Not sure. linuzappz?)\nRevised by arcum42@gmail.com"));
-  gtk_widget_set_name (label3, "label3");
-  gtk_widget_show (label3);
-  gtk_box_pack_start (GTK_BOX (vbox2), label3, FALSE, FALSE, 0);
-
-  hbuttonbox2 = gtk_hbutton_box_new ();
-  gtk_widget_set_name (hbuttonbox2, "hbuttonbox2");
-  gtk_widget_show (hbuttonbox2);
-  gtk_box_pack_start (GTK_BOX (vbox2), hbuttonbox2, TRUE, TRUE, 0);
-  gtk_box_set_spacing (GTK_BOX (hbuttonbox2), 30);
-
-  button3 = gtk_button_new_with_mnemonic (_("Ok"));
-  gtk_widget_set_name (button3, "button3");
-  gtk_widget_show (button3);
-  gtk_container_add (GTK_CONTAINER (hbuttonbox2), button3);
-  GTK_WIDGET_SET_FLAGS (button3, GTK_CAN_DEFAULT);
-
-  g_signal_connect ((gpointer) button3, "clicked",
-                    G_CALLBACK (OnAbout_Ok),
-                    NULL);
-
-  /* Store pointers to all widgets, for use by lookup_widget(). */
-  GLADE_HOOKUP_OBJECT_NO_REF (About, About, "About");
-  GLADE_HOOKUP_OBJECT (About, vbox2, "vbox2");
-  GLADE_HOOKUP_OBJECT (About, label2, "label2");
-  GLADE_HOOKUP_OBJECT (About, label3, "label3");
-  GLADE_HOOKUP_OBJECT (About, hbuttonbox2, "hbuttonbox2");
-  GLADE_HOOKUP_OBJECT (About, button3, "button3");
-
-  return About;
-}
-

plugins/CDVDnull/Linux/interface.h

@@ -1,6 +0,0 @@
-/*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
- */
-
-GtkWidget* create_Config (void);
-GtkWidget* create_About (void);

plugins/CDVDnull/Linux/support.c

@@ -1,144 +0,0 @@
-/*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
- */
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdio.h>
-
-#include <gtk/gtk.h>
-
-#include "support.h"
-
-GtkWidget*
-lookup_widget                          (GtkWidget       *widget,
-                                        const gchar     *widget_name)
-{
-  GtkWidget *parent, *found_widget;
-
-  for (;;)
-    {
-      if (GTK_IS_MENU (widget))
-        parent = gtk_menu_get_attach_widget (GTK_MENU (widget));
-      else
-        parent = widget->parent;
-      if (!parent)
-        parent = (GtkWidget*) g_object_get_data (G_OBJECT (widget), "GladeParentKey");
-      if (parent == NULL)
-        break;
-      widget = parent;
-    }
-
-  found_widget = (GtkWidget*) g_object_get_data (G_OBJECT (widget),
-                                                 widget_name);
-  if (!found_widget)
-    g_warning ("Widget not found: %s", widget_name);
-  return found_widget;
-}
-
-static GList *pixmaps_directories = NULL;
-
-/* Use this function to set the directory containing installed pixmaps. */
-void
-add_pixmap_directory                   (const gchar     *directory)
-{
-  pixmaps_directories = g_list_prepend (pixmaps_directories,
-                                        g_strdup (directory));
-}
-
-/* This is an internally used function to find pixmap files. */
-static gchar*
-find_pixmap_file                       (const gchar     *filename)
-{
-  GList *elem;
-
-  /* We step through each of the pixmaps directory to find it. */
-  elem = pixmaps_directories;
-  while (elem)
-    {
-      gchar *pathname = g_strdup_printf ("%s%s%s", (gchar*)elem->data,
-                                         G_DIR_SEPARATOR_S, filename);
-      if (g_file_test (pathname, G_FILE_TEST_EXISTS))
-        return pathname;
-      g_free (pathname);
-      elem = elem->next;
-    }
-  return NULL;
-}
-
-/* This is an internally used function to create pixmaps. */
-GtkWidget*
-create_pixmap                          (GtkWidget       *widget,
-                                        const gchar     *filename)
-{
-  gchar *pathname = NULL;
-  GtkWidget *pixmap;
-
-  if (!filename || !filename[0])
-      return gtk_image_new ();
-
-  pathname = find_pixmap_file (filename);
-
-  if (!pathname)
-    {
-      g_warning (_("Couldn't find pixmap file: %s"), filename);
-      return gtk_image_new ();
-    }
-
-  pixmap = gtk_image_new_from_file (pathname);
-  g_free (pathname);
-  return pixmap;
-}
-
-/* This is an internally used function to create pixmaps. */
-GdkPixbuf*
-create_pixbuf                          (const gchar     *filename)
-{
-  gchar *pathname = NULL;
-  GdkPixbuf *pixbuf;
-  GError *error = NULL;
-
-  if (!filename || !filename[0])
-      return NULL;
-
-  pathname = find_pixmap_file (filename);
-
-  if (!pathname)
-    {
-      g_warning (_("Couldn't find pixmap file: %s"), filename);
-      return NULL;
-    }
-
-  pixbuf = gdk_pixbuf_new_from_file (pathname, &error);
-  if (!pixbuf)
-    {
-      fprintf (stderr, "Failed to load pixbuf file: %s: %s\n",
-               pathname, error->message);
-      g_error_free (error);
-    }
-  g_free (pathname);
-  return pixbuf;
-}
-
-/* This is used to set ATK action descriptions. */
-void
-glade_set_atk_action_description       (AtkAction       *action,
-                                        const gchar     *action_name,
-                                        const gchar     *description)
-{
-  gint n_actions, i;
-
-  n_actions = atk_action_get_n_actions (action);
-  for (i = 0; i < n_actions; i++)
-    {
-      if (!strcmp (atk_action_get_name (action, i), action_name))
-        atk_action_set_description (action, i, description);
-    }
-}
-

plugins/CDVDnull/Linux/support.h

@@ -1,69 +0,0 @@
-/*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
- */
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#include <gtk/gtk.h>
-
-/*
- * Standard gettext macros.
- */
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (PACKAGE, String)
-#  define Q_(String) g_strip_context ((String), gettext (String))
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define Q_(String) g_strip_context ((String), (String))
-#  define N_(String) (String)
-#endif
-
-
-/*
- * Public Functions.
- */
-
-/*
- * This function returns a widget in a component created by Glade.
- * Call it with the toplevel widget in the component (i.e. a window/dialog),
- * or alternatively any widget in the component, and the name of the widget
- * you want returned.
- */
-GtkWidget*  lookup_widget              (GtkWidget       *widget,
-                                        const gchar     *widget_name);
-
-
-/* Use this function to set the directory containing installed pixmaps. */
-void        add_pixmap_directory       (const gchar     *directory);
-
-
-/*
- * Private Functions.
- */
-
-/* This is used to create the pixmaps used in the interface. */
-GtkWidget*  create_pixmap              (GtkWidget       *widget,
-                                        const gchar     *filename);
-
-/* This is used to create the pixbufs used in the interface. */
-GdkPixbuf*  create_pixbuf              (const gchar     *filename);
-
-/* This is used to set ATK action descriptions. */
-void        glade_set_atk_action_description (AtkAction       *action,
-                                              const gchar     *action_name,
-                                              const gchar     *description);
-

plugins/CDVDnull/Makefile.am

@@ -1,27 +0,0 @@
-# Create a shared library libCDVDnull
-AUTOMAKE_OPTIONS = foreign
-noinst_LIBRARIES = libCDVDnull.a
-INCLUDES = -I@srcdir@/../../common/include -I@srcdir@/../../3rdparty -I@srcdir@/Linux
-
-libCDVDnull_a_CXXFLAGS = $(shell pkg-config --cflags gtk+-2.0)
-libCDVDnull_a_CFLAGS = $(shell pkg-config --cflags gtk+-2.0)
-
-# Create a shared object by faking an exe (thanks to ODE makefiles)
-traplibdir=$(prefix)
-
-if DEBUGBUILD
-preext=d
-endif
-
-EXEEXT=$(preext)@so_ext@
-
-traplib_PROGRAMS=libCDVDnull
-libCDVDnull_SOURCES=
-libCDVDnull_DEPENDENCIES = libCDVDnull.a
-libCDVDnull_LDFLAGS= @SHARED_LDFLAGS@
-libCDVDnull_LDFLAGS+=-Wl,-soname,@libCDVDnull_SONAME@
-libCDVDnull_LDADD=$(libCDVDnull_a_OBJECTS)
-
-libCDVDnull_a_SOURCES = CDVD.cpp CDVD.h Linux/Config.cpp
-
-#SUBDIRS = Linux

plugins/CDVDnull/build.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-echo ---------------
-echo Building CDVDnull
-echo ---------------
-
-curdir=`pwd`
-
-
-if test "${CDVDnullOPTIONS+set}" != set ; then
-export CDVDnullOPTIONS=""
-fi
-
-if [ $# -gt 0 ] && [ $1 = "all" ]
-then
-
-aclocal
-automake -a
-autoconf
-
-./configure ${CDVDnullOPTIONS} --prefix=${PCSX2PLUGINS}
-make clean
-make install
-
-else
-make $@
-fi
-
-if [ $? -ne 0 ]
-then
-exit 1
-fi

plugins/CDVDnull/configure.ac

@@ -1,83 +0,0 @@
-AC_INIT(CDVDnull, 0.6,arcum42@gmail.com)
-
-AM_INIT_AUTOMAKE(CDVDnull,0.6)
-
-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++])
-
-AC_PROG_INSTALL
-AC_PROG_RANLIB
-
-dnl necessary for compiling assembly
-AM_PROG_AS
-
-AC_SUBST(CDVDnull_CURRENT, 0)
-AC_SUBST(CDVDnull_REVISION, 8)
-AC_SUBST(CDVDnull_AGE, 0)
-AC_SUBST(CDVDnull_RELEASE,[$CDVDnull_CURRENT].[$CDVDnull_REVISION].[$CDVDnull_AGE])
-AC_SUBST(CDVDnull_SONAME,libCDVDnull.so.[$CDVDnull_CURRENT].[$CDVDnull_REVISION].[$CDVDnull_AGE])
-
-CFLAGS=
-CPPFLAGS=
-CXXFLAGS=
-CCASFLAGS=
-
-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(PCSX2_DEBUG,1,[PCSX2_DEBUG])
- CFLAGS+="-g -fPIC -Wall  -Wno-unused-value -m32 "
- CPPFLAGS+="-g -fPIC -Wall  -Wno-unused-value -m32 "
- CXXFLAGS+="-g -fPIC -Wall  -Wno-unused-value -m32 "
- CCASFLAGS+=" -m32 "
-else
- AC_DEFINE(NDEBUG,1,[NDEBUG])
- CFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall  -Wno-unused-value -m32 "
- CPPFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall  -Wno-unused-value -m32 "
- CXXFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall  -Wno-unused-value -m32 "
- CCASFLAGS+=" -m32 "
-fi
-AM_CONDITIONAL(DEBUGBUILD, test x$debug = xyes)
-AC_MSG_RESULT($debug)
-
-AC_DEFINE(__LINUX__,1,[__LINUX__])
-
-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" == xyes
-then
- AC_DEFINE(CDVDnull_DEVBUILD,1,[CDVDnull_DEVBUILD])
-fi
-AC_MSG_RESULT($devbuild)
-AM_CONDITIONAL(RELEASE_TO_PUBLIC, test x$devbuild = xno)
-
-AC_CHECK_FUNCS([ _aligned_malloc _aligned_free ], AC_DEFINE(HAVE_ALIGNED_MALLOC))
-
-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.$CDVDnull_RELEASE"
-SHARED_LDFLAGS="-shared"
-AC_SUBST(so_ext)
-AC_SUBST(SHARED_LDFLAGS)
-
-AC_CHECK_LIB(stdc++,main,[LIBS="$LIBS -lstdc++"])
-
-AC_OUTPUT([
- Makefile
- ])
-
-echo "Configuration:"
-echo "  Debug build?	       $debug"
-echo "  Dev build?	       $devbuild"

plugins/CDVDnull/install-sh

@@ -1 +0,0 @@
-/usr/share/automake-1.10/install-sh

plugins/CDVDnull/missing

@@ -1 +0,0 @@
-/usr/share/automake-1.10/missing

plugins/FWnull/CMakeLists.txt

@@ -11,7 +11,6 @@ set(FWnullName FWnull)
 
 set(CommonFlags
     -Wall
-    -m32
     )
 
 set(OptimizationFlags
@@ -75,15 +74,6 @@ add_library(${FWnullName} SHARED
 			${FWnullLinuxSources}
 			${FWnullLinuxHeaders})
 
-# Force the linker into 32 bits mode
-target_link_libraries(${FWnullName} -m32)
-
-# Linker strip option
-if (CMAKE_BUILD_STRIP)
-    target_link_libraries(${FWnullName} -s)
-endif (CMAKE_BUILD_STRIP)
-
 # set output directory
 set_target_properties(${FWnullName} PROPERTIES
 					  LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)
-

plugins/FWnull/Makefile.am

@@ -1,32 +0,0 @@
-# Create a shared library libFWnull
-AUTOMAKE_OPTIONS = foreign
-noinst_LIBRARIES = libFWnull.a
-INCLUDES = -I@srcdir@/../../common/include -I@srcdir@/../../3rdparty -I@srcdir@/Linux
-
-libFWnull_a_CXXFLAGS = $(shell pkg-config --cflags gtk+-2.0)
-libFWnull_a_CFLAGS = $(shell pkg-config --cflags gtk+-2.0)
-
-# Create a shared object by faking an exe (thanks to ODE makefiles)
-traplibdir=$(prefix)
-
-if DEBUGBUILD
-preext=d
-endif
-
-EXEEXT=$(preext)@so_ext@
-
-traplib_PROGRAMS=libFWnull
-libFWnull_SOURCES=
-libFWnull_DEPENDENCIES = libFWnull.a
-libFWnull_LDFLAGS= @SHARED_LDFLAGS@
-libFWnull_LDFLAGS+=-Wl,-soname,@libFWnull_SONAME@
-libFWnull_LDADD=$(libFWnull_a_OBJECTS)
-
-libFWnull_a_SOURCES = FW.cpp FW.h Linux/Config.cpp Linux/Config.h
-
-libFWnull_a_SOURCES += \
-Linux/interface.h Linux/support.c  \
-Linux/interface.c Linux/support.h \
-Linux/callbacks.h 
-
-#SUBDIRS = Linux

plugins/FWnull/build.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-echo ---------------
-echo Building FWnull
-echo ---------------
-
-curdir=`pwd`
-
-
-if test "${FWnullOPTIONS+set}" != set ; then
-export FWnullOPTIONS=""
-fi
-
-if [ $# -gt 0 ] && [ $1 = "all" ]
-then
-
-aclocal
-automake -a
-autoconf
-
-./configure ${FWnullOPTIONS} --prefix=${PCSX2PLUGINS}
-make clean
-make install
-
-else
-make $@
-fi
-
-if [ $? -ne 0 ]
-then
-exit 1
-fi

plugins/FWnull/configure.ac

@@ -1,83 +0,0 @@
-AC_INIT(FWnull, 0.5,arcum42@gmail.com)
-
-AM_INIT_AUTOMAKE(FWnull,0.5)
-
-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++])
-
-AC_PROG_INSTALL
-AC_PROG_RANLIB
-
-dnl necessary for compiling assembly
-AM_PROG_AS
-
-AC_SUBST(FWnull_CURRENT, 0)
-AC_SUBST(FWnull_REVISION, 5)
-AC_SUBST(FWnull_AGE, 0)
-AC_SUBST(FWnull_RELEASE,[$FWnull_CURRENT].[$FWnull_REVISION].[$FWnull_AGE])
-AC_SUBST(FWnull_SONAME,libFWnull.so.[$FWnull_CURRENT].[$FWnull_REVISION].[$FWnull_AGE])
-
-CFLAGS=
-CPPFLAGS=
-CXXFLAGS=
-CCASFLAGS=
-
-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 -fPIC -Wall  -Wno-unused-value -m32 "
- CPPFLAGS+="-g -fPIC -Wall  -Wno-unused-value -m32 "
- CXXFLAGS+="-g -fPIC -Wall  -Wno-unused-value -m32 "
- CCASFLAGS+=" -m32 "
-else
- AC_DEFINE(NDEBUG,1,[NDEBUG])
- CFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall  -Wno-unused-value -m32 "
- CPPFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall  -Wno-unused-value -m32 "
- CXXFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall  -Wno-unused-value -m32 "
- CCASFLAGS+=" -m32 "
-fi
-AM_CONDITIONAL(DEBUGBUILD, test x$debug = xyes)
-AC_MSG_RESULT($debug)
-
-AC_DEFINE(__LINUX__,1,[__LINUX__])
-
-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" == xyes
-then
- AC_DEFINE(FWnull_DEVBUILD,1,[FWnull_DEVBUILD])
-fi
-AC_MSG_RESULT($devbuild)
-AM_CONDITIONAL(RELEASE_TO_PUBLIC, test x$devbuild = xno)
-
-AC_CHECK_FUNCS([ _aligned_malloc _aligned_free ], AC_DEFINE(HAVE_ALIGNED_MALLOC))
-
-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.$FWnull_RELEASE"
-SHARED_LDFLAGS="-shared"
-AC_SUBST(so_ext)
-AC_SUBST(SHARED_LDFLAGS)
-
-AC_CHECK_LIB(stdc++,main,[LIBS="$LIBS -lstdc++"])
-
-AC_OUTPUT([
- Makefile
- ])
-
-echo "Configuration:"
-echo "  Debug build?	       $debug"
-echo "  Dev build?	       $devbuild"

plugins/FWnull/install-sh

@@ -1 +0,0 @@
-/usr/share/automake-1.10/install-sh

plugins/FWnull/missing

@@ -1 +0,0 @@
-/usr/share/automake-1.10/missing

plugins/GSnull/CMakeLists.txt

@@ -11,7 +11,6 @@ set(GSnullName GSnull)
 
 set(CommonFlags
     -Wall
-    -m32
     -msse2
     )
 
@@ -93,15 +92,6 @@ add_library(${GSnullName} SHARED
 			${GSnullLinuxSources}
 			${GSnullLinuxHeaders})
 
-# Force the linker into 32 bits mode
-target_link_libraries(${GSnullName} -m32)
-
-# Linker strip option
-if (CMAKE_BUILD_STRIP)
-    target_link_libraries(${GSnullName} -s)
-endif (CMAKE_BUILD_STRIP)
-
 # set output directory
 set_target_properties(${GSnullName} PROPERTIES
 					  LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)
-

plugins/PadNull/CMakeLists.txt

@@ -8,7 +8,6 @@ endif(NOT TOP_CMAKE_WAS_SOURCED)
 
 set(CommonFlags
     -Wall
-    -m32
     )
 
 set(OptimizationFlags
@@ -75,15 +74,6 @@ add_library(${PadNullName} SHARED
 			${PadNullLinuxSources}
 			${PadNullLinuxHeaders})
 
-# Force the linker into 32 bits mode
-target_link_libraries(${PadNullName} -m32)
-
-# Linker strip option
-if (CMAKE_BUILD_STRIP)
-    target_link_libraries(${PadNullName} -s)
-endif (CMAKE_BUILD_STRIP)
-
 # set output directory
 set_target_properties(${PadNullName} PROPERTIES
 					  LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)
-

plugins/PadNull/Makefile.am

@@ -1,31 +0,0 @@
-# Create a shared library libPadnull
-AUTOMAKE_OPTIONS = foreign
-noinst_LIBRARIES = libPadnull.a
-INCLUDES = -I@srcdir@/../../common/include -I@srcdir@/../../3rdparty -I@srcdir@/Linux
-
-libPadnull_a_CXXFLAGS = $(shell pkg-config --cflags gtk+-2.0)
-libPadnull_a_CFLAGS = $(shell pkg-config --cflags gtk+-2.0)
-
-# Create a shared object by faking an exe (thanks to ODE makefiles)
-traplibdir=$(prefix)
-
-if DEBUGBUILD
-preext=d
-endif
-
-EXEEXT=$(preext)@so_ext@
-
-traplib_PROGRAMS=libPadnull
-libPadnull_SOURCES=
-libPadnull_DEPENDENCIES = libPadnull.a
-libPadnull_LDFLAGS= @SHARED_LDFLAGS@
-libPadnull_LDFLAGS+=-Wl,-soname,@libPadnull_SONAME@
-libPadnull_LDADD=$(libPadnull_a_OBJECTS)
-
-libPadnull_a_SOURCES = Pad.cpp Pad.h Linux/Config.cpp Linux/Config.h \
-Linux/PadLinux.cpp Linux/PadLinux.h
-
-libPadnull_a_SOURCES += \
-Linux/interface.h Linux/support.c  \
-Linux/interface.c Linux/support.h \
-Linux/callbacks.h 

plugins/PadNull/build.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-echo ---------------
-echo Building Padnull
-echo ---------------
-
-curdir=`pwd`
-
-
-if test "${PadnullOPTIONS+set}" != set ; then
-export PadnullOPTIONS=""
-fi
-
-if [ $# -gt 0 ] && [ $1 = "all" ]
-then
-
-aclocal
-automake -a
-autoconf
-
-./configure ${PadnullOPTIONS} --prefix=${PCSX2PLUGINS}
-make clean
-make install
-
-else
-make $@
-fi
-
-if [ $? -ne 0 ]
-then
-exit 1
-fi

plugins/PadNull/configure.ac

@@ -1,83 +0,0 @@
-AC_INIT(Padnull, 0.1,arcum42@gmail.com)
-
-AM_INIT_AUTOMAKE(Padnull,0.1)
-
-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++])
-
-AC_PROG_INSTALL
-AC_PROG_RANLIB
-
-dnl necessary for compiling assembly
-AM_PROG_AS
-
-AC_SUBST(Padnull_CURRENT, 0)
-AC_SUBST(Padnull_REVISION, 1)
-AC_SUBST(Padnull_AGE, 0)
-AC_SUBST(Padnull_RELEASE,[$Padnull_CURRENT].[$Padnull_REVISION].[$Padnull_AGE])
-AC_SUBST(Padnull_SONAME,libPadnull.so.[$Padnull_CURRENT].[$Padnull_REVISION].[$Padnull_AGE])
-
-CFLAGS=
-CPPFLAGS=
-CXXFLAGS=
-CCASFLAGS=
-
-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(PCSX2_DEBUG,1,[PCSX2_DEBUG])
- CFLAGS+="-g -fPIC -Wall  -Wno-unused-value -m32 "
- CPPFLAGS+="-g -fPIC -Wall  -Wno-unused-value -m32 "
- CXXFLAGS+="-g -fPIC -Wall  -Wno-unused-value -m32 "
- CCASFLAGS+=" -m32 "
-else
- AC_DEFINE(NDEBUG,1,[NDEBUG])
- CFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall  -Wno-unused-value -m32 "
- CPPFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall  -Wno-unused-value -m32 "
- CXXFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall  -Wno-unused-value -m32 "
- CCASFLAGS+=" -m32 "
-fi
-AM_CONDITIONAL(DEBUGBUILD, test x$debug = xyes)
-AC_MSG_RESULT($debug)
-
-AC_DEFINE(__LINUX__,1,[__LINUX__])
-
-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" == xyes
-then
- AC_DEFINE(Padnull_DEVBUILD,1,[Padnull_DEVBUILD])
-fi
-AC_MSG_RESULT($devbuild)
-AM_CONDITIONAL(RELEASE_TO_PUBLIC, test x$devbuild = xno)
-
-AC_CHECK_FUNCS([ _aligned_malloc _aligned_free ], AC_DEFINE(HAVE_ALIGNED_MALLOC))
-
-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.$Padnull_RELEASE"
-SHARED_LDFLAGS="-shared"
-AC_SUBST(so_ext)
-AC_SUBST(SHARED_LDFLAGS)
-
-AC_CHECK_LIB(stdc++,main,[LIBS="$LIBS -lstdc++"])
-
-AC_OUTPUT([
- Makefile
- ])
-
-echo "Configuration:"
-echo "  Debug build?	       $debug"
-echo "  Dev build?	       $devbuild"

plugins/SPU2null/CMakeLists.txt

@@ -11,7 +11,6 @@ set(SPU2nullName SPU2null)
 
 set(CommonFlags
     -Wall
-    -m32
     )
 
 set(OptimizationFlags
@@ -74,16 +73,6 @@ add_library(${SPU2nullName} SHARED
 			${SPU2nullLinuxSources}
 			${SPU2nullLinuxHeaders})
 
-
-# Force the linker into 32 bits mode
-target_link_libraries(${SPU2nullName} -m32)
-
-# Linker strip option
-if (CMAKE_BUILD_STRIP)
-    target_link_libraries(${SPU2nullName} -s)
-endif (CMAKE_BUILD_STRIP)
-
 # set output directory
 set_target_properties(${SPU2nullName} PROPERTIES
 					  LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)
-

plugins/SPU2null/Makefile.am

@@ -1,32 +0,0 @@
-# Create a shared library libSPU2null
-AUTOMAKE_OPTIONS = foreign
-noinst_LIBRARIES = libSPU2null.a
-INCLUDES = -I@srcdir@/../../common/include -I@srcdir@/../../3rdparty -I@srcdir@/Linux
-
-libSPU2null_a_CXXFLAGS = $(shell pkg-config --cflags gtk+-2.0)
-libSPU2null_a_CFLAGS = $(shell pkg-config --cflags gtk+-2.0)
-
-# Create a shared object by faking an exe (thanks to ODE makefiles)
-traplibdir=$(prefix)
-
-if DEBUGBUILD
-preext=d
-endif
-
-EXEEXT=$(preext)@so_ext@
-
-traplib_PROGRAMS=libSPU2null
-libSPU2null_SOURCES=
-libSPU2null_DEPENDENCIES = libSPU2null.a
-libSPU2null_LDFLAGS= @SHARED_LDFLAGS@
-libSPU2null_LDFLAGS+=-Wl,-soname,@libSPU2null_SONAME@
-libSPU2null_LDADD=$(libSPU2null_a_OBJECTS)
-
-libSPU2null_a_SOURCES = SPU2.cpp SPU2.h Linux/Config.cpp 
-
-libSPU2null_a_SOURCES += \
-Linux/interface.h Linux/support.c  \
-Linux/interface.c Linux/support.h \
-Linux/callbacks.h 
-
-#SUBDIRS = Linux

plugins/SPU2null/build.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-echo ---------------
-echo Building SPU2null
-echo ---------------
-
-curdir=`pwd`
-
-
-if test "${SPU2nullOPTIONS+set}" != set ; then
-export SPU2nullOPTIONS=""
-fi
-
-if [ $# -gt 0 ] && [ $1 = "all" ]
-then
-
-aclocal
-automake -a
-autoconf
-
-./configure ${SPU2nullOPTIONS} --prefix=${PCSX2PLUGINS}
-make clean
-make install
-
-else
-make $@
-fi
-
-if [ $? -ne 0 ]
-then
-exit 1
-fi

plugins/SPU2null/configure.ac

@@ -1,83 +0,0 @@
-AC_INIT(SPU2null, 0.71,arcum42@gmail.com)
-
-AM_INIT_AUTOMAKE(SPU2null,0.71)
-
-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++])
-
-AC_PROG_INSTALL
-AC_PROG_RANLIB
-
-dnl necessary for compiling assembly
-AM_PROG_AS
-
-AC_SUBST(SPU2null_CURRENT, 0)
-AC_SUBST(SPU2null_REVISION, 7)
-AC_SUBST(SPU2null_AGE, 1)
-AC_SUBST(SPU2null_RELEASE,[$SPU2null_CURRENT].[$SPU2null_REVISION].[$SPU2null_AGE])
-AC_SUBST(SPU2null_SONAME,libSPU2null.so.[$SPU2null_CURRENT].[$SPU2null_REVISION].[$SPU2null_AGE])
-
-CFLAGS=
-CPPFLAGS=
-CXXFLAGS=
-CCASFLAGS=
-
-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(PCSX2_DEBUG,1,[PCSX2_DEBUG])
- CFLAGS+="-g -fPIC -Wall  -Wno-unused-value -m32 "
- CPPFLAGS+="-g -fPIC -Wall  -Wno-unused-value -m32 "
- CXXFLAGS+="-g -fPIC -Wall  -Wno-unused-value -m32 "
- CCASFLAGS+=" -m32 "
-else
- AC_DEFINE(NDEBUG,1,[NDEBUG])
- CFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall  -Wno-unused-value -m32 "
- CPPFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall  -Wno-unused-value -m32 "
- CXXFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall  -Wno-unused-value -m32 "
- CCASFLAGS+=" -m32 "
-fi
-AM_CONDITIONAL(DEBUGBUILD, test x$debug = xyes)
-AC_MSG_RESULT($debug)
-
-AC_DEFINE(__LINUX__,1,[__LINUX__])
-
-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" == xyes
-then
- AC_DEFINE(SPU2null_DEVBUILD,1,[SPU2null_DEVBUILD])
-fi
-AC_MSG_RESULT($devbuild)
-AM_CONDITIONAL(RELEASE_TO_PUBLIC, test x$devbuild = xno)
-
-AC_CHECK_FUNCS([ _aligned_malloc _aligned_free ], AC_DEFINE(HAVE_ALIGNED_MALLOC))
-
-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.$SPU2null_RELEASE"
-SHARED_LDFLAGS="-shared"
-AC_SUBST(so_ext)
-AC_SUBST(SHARED_LDFLAGS)
-
-AC_CHECK_LIB(stdc++,main,[LIBS="$LIBS -lstdc++"])
-
-AC_OUTPUT([
- Makefile
- ])
-
-echo "Configuration:"
-echo "  Debug build?	       $debug"
-echo "  Dev build?	       $devbuild"

plugins/SPU2null/install-sh

@@ -1 +0,0 @@
-/usr/share/automake-1.10/install-sh

plugins/SPU2null/missing

@@ -1 +0,0 @@
-/usr/share/automake-1.10/missing

plugins/USBnull/CMakeLists.txt

@@ -11,7 +11,6 @@ set(USBnullName USBnull)
 
 set(CommonFlags
     -Wall
-    -m32
     )
 
 set(OptimizationFlags
@@ -76,15 +75,6 @@ add_library(${USBnullName} SHARED
 			${USBnullLinuxSources}
 			${USBnullLinuxHeaders})
 
-# Force the linker into 32 bits mode
-target_link_libraries(${USBnullName} -m32)
-
-# Linker strip option
-if (CMAKE_BUILD_STRIP)
-    target_link_libraries(${USBnullName} -s)
-endif (CMAKE_BUILD_STRIP)
-
 # set output directory
 set_target_properties(${USBnullName} PROPERTIES
 					  LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)
-

plugins/USBnull/Makefile.am

@@ -1,33 +0,0 @@
-# Create a shared library libUSBnull
-AUTOMAKE_OPTIONS = foreign
-noinst_LIBRARIES = libUSBnull.a
-INCLUDES = -I@srcdir@/../../common/include -I@srcdir@/../../3rdparty -I@srcdir@/Linux
-
-libUSBnull_a_CXXFLAGS = $(shell pkg-config --cflags gtk+-2.0)
-libUSBnull_a_CFLAGS = $(shell pkg-config --cflags gtk+-2.0)
-
-# Create a shared object by faking an exe (thanks to ODE makefiles)
-traplibdir=$(prefix)
-
-if DEBUGBUILD
-preext=d
-endif
-
-EXEEXT=$(preext)@so_ext@
-
-traplib_PROGRAMS=libUSBnull
-libUSBnull_SOURCES=
-libUSBnull_DEPENDENCIES = libUSBnull.a
-libUSBnull_LDFLAGS= @SHARED_LDFLAGS@
-libUSBnull_LDFLAGS+=-Wl,-soname,@libUSBnull_SONAME@
-libUSBnull_LDADD=$(libUSBnull_a_OBJECTS)
-
-libUSBnull_a_SOURCES = USB.cpp Linux/Config.cpp Linux/Linux.cpp \
-USB.h Linux/Config.h Linux/Linux.h
-
-libUSBnull_a_SOURCES += \
-Linux/interface.h Linux/support.c  \
-Linux/interface.c Linux/support.h \
-Linux/callbacks.h 
-
-#SUBDIRS = Linux

plugins/USBnull/build.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-echo ---------------
-echo Building USBnull
-echo ---------------
-
-curdir=`pwd`
-
-
-if test "${USBnullOPTIONS+set}" != set ; then
-export USBnullOPTIONS=""
-fi
-
-if [ $# -gt 0 ] && [ $1 = "all" ]
-then
-
-aclocal
-automake -a
-autoconf
-
-./configure ${USBnullOPTIONS} --prefix=${PCSX2PLUGINS}
-make clean
-make install
-
-else
-make $@
-fi
-
-if [ $? -ne 0 ]
-then
-exit 1
-fi

plugins/USBnull/configure.ac

@@ -1,83 +0,0 @@
-AC_INIT(USBnull, 0.6,arcum42@gmail.com)
-
-AM_INIT_AUTOMAKE(USBnull,0.6)
-
-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++])
-
-AC_PROG_INSTALL
-AC_PROG_RANLIB
-
-dnl necessary for compiling assembly
-AM_PROG_AS
-
-AC_SUBST(USBnull_CURRENT, 0)
-AC_SUBST(USBnull_REVISION, 6)
-AC_SUBST(USBnull_AGE, 0)
-AC_SUBST(USBnull_RELEASE,[$USBnull_CURRENT].[$USBnull_REVISION].[$USBnull_AGE])
-AC_SUBST(USBnull_SONAME,libUSBnull.so.[$USBnull_CURRENT].[$USBnull_REVISION].[$USBnull_AGE])
-
-CFLAGS=
-CPPFLAGS=
-CXXFLAGS=
-CCASFLAGS=
-
-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(PCSX2_DEBUG,1,[PCSX2_DEBUG])
- CFLAGS+="-g -fPIC -Wall  -Wno-unused-value -m32 "
- CPPFLAGS+="-g -fPIC -Wall  -Wno-unused-value -m32 "
- CXXFLAGS+="-g -fPIC -Wall  -Wno-unused-value -m32 "
- CCASFLAGS+=" -m32 "
-else
- AC_DEFINE(NDEBUG,1,[NDEBUG])
- CFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall  -Wno-unused-value -m32 "
- CPPFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall  -Wno-unused-value -m32 "
- CXXFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall  -Wno-unused-value -m32 "
- CCASFLAGS+=" -m32 "
-fi
-AM_CONDITIONAL(DEBUGBUILD, test x$debug = xyes)
-AC_MSG_RESULT($debug)
-
-AC_DEFINE(__LINUX__,1,[__LINUX__])
-
-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" == xyes
-then
- AC_DEFINE(USBnull_DEVBUILD,1,[USBnull_DEVBUILD])
-fi
-AC_MSG_RESULT($devbuild)
-AM_CONDITIONAL(RELEASE_TO_PUBLIC, test x$devbuild = xno)
-
-AC_CHECK_FUNCS([ _aligned_malloc _aligned_free ], AC_DEFINE(HAVE_ALIGNED_MALLOC))
-
-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.$USBnull_RELEASE"
-SHARED_LDFLAGS="-shared"
-AC_SUBST(so_ext)
-AC_SUBST(SHARED_LDFLAGS)
-
-AC_CHECK_LIB(stdc++,main,[LIBS="$LIBS -lstdc++"])
-
-AC_OUTPUT([
- Makefile
- ])
-
-echo "Configuration:"
-echo "  Debug build?	       $debug"
-echo "  Dev build?	       $devbuild"

plugins/USBnull/install-sh

@@ -1 +0,0 @@
-/usr/share/automake-1.10/install-sh

plugins/USBnull/missing

@@ -1 +0,0 @@
-/usr/share/automake-1.10/missing

plugins/build.sh

@@ -15,20 +15,12 @@ fi
 fi
 }
 
-buildplugin CDVDnull $@
-buildplugin dev9null $@
-buildplugin FWnull $@
-buildplugin USBnull $@
-buildplugin SPU2null $@
-
 buildplugin zerogs $@
 buildplugin zzogl $@
 buildplugin zzogl-pg $@
 buildplugin zeropad $@
-buildplugin zerospu2 $@
 
 buildplugin PeopsSPU2 $@
 
-buildplugin CDVDiso $@
 buildplugin CDVDisoEFP $@
 buildplugin CDVDlinuz $@

plugins/dev9null/CMakeLists.txt

@@ -11,7 +11,6 @@ set(dev9nullName dev9null)
 
 set(CommonFlags
     -Wall
-    -m32
     )
 
 set(OptimizationFlags
@@ -73,15 +72,6 @@ add_library(${dev9nullName} SHARED
 			${dev9nullLinuxSources}
 			${dev9nullLinuxHeaders})
 
-# Force the linker into 32 bits mode
-target_link_libraries(${dev9nullName} -m32)
-
-# Linker strip option
-if (CMAKE_BUILD_STRIP)
-    target_link_libraries(${dev9nullName} -s)
-endif (CMAKE_BUILD_STRIP)
-
 # set output directory
 set_target_properties(${dev9nullName} PROPERTIES
 					  LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)
-

plugins/dev9null/Makefile.am

@@ -1,31 +0,0 @@
-# Create a shared library libDEV9null
-AUTOMAKE_OPTIONS = foreign
-noinst_LIBRARIES = libDEV9null.a
-INCLUDES = -I@srcdir@/../../common/include -I@srcdir@/../../3rdparty -I@srcdir@/Linux
-
-libDEV9null_a_CXXFLAGS = $(shell pkg-config --cflags gtk+-2.0)
-libDEV9null_a_CFLAGS = $(shell pkg-config --cflags gtk+-2.0)
-
-# Create a shared object by faking an exe (thanks to ODE makefiles)
-traplibdir=$(prefix)
-
-if DEBUGBUILD
-preext=d
-endif
-
-EXEEXT=$(preext)@so_ext@
-
-traplib_PROGRAMS=libDEV9null
-libDEV9null_SOURCES=
-libDEV9null_DEPENDENCIES = libDEV9null.a
-libDEV9null_LDFLAGS= @SHARED_LDFLAGS@
-libDEV9null_LDFLAGS+=-Wl,-soname,@libDEV9null_SONAME@
-libDEV9null_LDADD=$(libDEV9null_a_OBJECTS)
-
-libDEV9null_a_SOURCES = DEV9.cpp DEV9.h Linux/Config.cpp Linux/Config.h
-
-libDEV9null_a_SOURCES += \
-Linux/interface.h Linux/support.c  \
-Linux/interface.c Linux/support.h \
-Linux/callbacks.h 
-#SUBDIRS = Linux

plugins/dev9null/build.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-echo ---------------
-echo Building DEV9null
-echo ---------------
-
-curdir=`pwd`
-
-
-if test "${DEV9nullOPTIONS+set}" != set ; then
-export DEV9nullOPTIONS=""
-fi
-
-if [ $# -gt 0 ] && [ $1 = "all" ]
-then
-
-aclocal
-automake -a
-autoconf
-
-./configure ${DEV9nullOPTIONS} --prefix=${PCSX2PLUGINS}
-make clean
-make install
-
-else
-make $@
-fi
-
-if [ $? -ne 0 ]
-then
-exit 1
-fi

plugins/dev9null/configure.ac

@@ -1,83 +0,0 @@
-AC_INIT(DEV9null, 0.4,arcum42@gmail.com)
-
-AM_INIT_AUTOMAKE(DEV9null,0.4)
-
-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++])
-
-AC_PROG_INSTALL
-AC_PROG_RANLIB
-
-dnl necessary for compiling assembly
-AM_PROG_AS
-
-AC_SUBST(DEV9null_CURRENT, 0)
-AC_SUBST(DEV9null_REVISION, 4)
-AC_SUBST(DEV9null_AGE, 0)
-AC_SUBST(DEV9null_RELEASE,[$DEV9null_CURRENT].[$DEV9null_REVISION].[$DEV9null_AGE])
-AC_SUBST(DEV9null_SONAME,libDEV9null.so.[$DEV9null_CURRENT].[$DEV9null_REVISION].[$DEV9null_AGE])
-
-CFLAGS=
-CPPFLAGS=
-CXXFLAGS=
-CCASFLAGS=
-
-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(PCSX2_DEBUG,1,[PCSX2_DEBUG])
- CFLAGS+="-g -fPIC -Wall  -Wno-unused-value -m32 "
- CPPFLAGS+="-g -fPIC -Wall  -Wno-unused-value -m32 "
- CXXFLAGS+="-g -fPIC -Wall  -Wno-unused-value -m32 "
- CCASFLAGS+=" -m32 "
-else
- AC_DEFINE(NDEBUG,1,[NDEBUG])
- CFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall  -Wno-unused-value -m32 "
- CPPFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall  -Wno-unused-value -m32 "
- CXXFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall  -Wno-unused-value -m32 "
- CCASFLAGS+=" -m32 "
-fi
-AM_CONDITIONAL(DEBUGBUILD, test x$debug = xyes)
-AC_MSG_RESULT($debug)
-
-AC_DEFINE(__LINUX__,1,[__LINUX__])
-
-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" == xyes
-then
- AC_DEFINE(DEV9null_DEVBUILD,1,[DEV9null_DEVBUILD])
-fi
-AC_MSG_RESULT($devbuild)
-AM_CONDITIONAL(RELEASE_TO_PUBLIC, test x$devbuild = xno)
-
-AC_CHECK_FUNCS([ _aligned_malloc _aligned_free ], AC_DEFINE(HAVE_ALIGNED_MALLOC))
-
-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.$DEV9null_RELEASE"
-SHARED_LDFLAGS="-shared"
-AC_SUBST(so_ext)
-AC_SUBST(SHARED_LDFLAGS)
-
-AC_CHECK_LIB(stdc++,main,[LIBS="$LIBS -lstdc++"])
-
-AC_OUTPUT([
- Makefile
- ])
-
-echo "Configuration:"
-echo "  Debug build?	       $debug"
-echo "  Dev build?	       $devbuild"

plugins/dev9null/install-sh

@@ -1 +0,0 @@
-/usr/share/automake-1.10/install-sh

plugins/dev9null/missing

@@ -1 +0,0 @@
-/usr/share/automake-1.10/missing

plugins/onepad/CMakeLists.txt

@@ -11,7 +11,6 @@ set(onepadName onepad)
 
 set(CommonFlags
     -Wall
-    -m32
     )
 
 set(OptimizationFlags
@@ -82,18 +81,9 @@ add_library(${onepadName} SHARED
 			${onepadLinuxSources}
 			${onepadLinuxHeaders})
 
-# Force the linker into 32 bits mode
-target_link_libraries(${onepadName} -m32)
-
-# Linker strip option
-if (CMAKE_BUILD_STRIP)
-    target_link_libraries(${onepadName} -s)
-endif (CMAKE_BUILD_STRIP)
-
 # set output directory
 set_target_properties(${onepadName} PROPERTIES
 					  LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)
 
 # link target with SDL
 target_link_libraries(${onepadName} ${SDL_LIBRARY})
-

plugins/onepad/Makefile.am

@@ -1,26 +0,0 @@
-# Create a shared library libOnePAD
-AUTOMAKE_OPTIONS = foreign
-noinst_LIBRARIES = libOnePAD.a
-INCLUDES = -I@srcdir@/../../common/include
-
-libOnePAD_a_CXXFLAGS = $(shell pkg-config --cflags gtk+-2.0)
-libOnePAD_a_CFLAGS = $(shell pkg-config --cflags gtk+-2.0)
-
-# Create a shared object by faking an exe (thanks to ODE makefiles)
-traplibdir=$(prefix)
-
-if DEBUGBUILD
-preext=d
-endif
-
-EXEEXT=$(preext)@so_ext@
-
-traplib_PROGRAMS=libOnePAD
-libOnePAD_SOURCES=
-libOnePAD_DEPENDENCIES = libOnePAD.a
-libOnePAD_LDFLAGS= @SHARED_LDFLAGS@
-libOnePAD_LDFLAGS+=-Wl,-soname,@ZEROPAD_SONAME@
-libOnePAD_LDADD=$(libOnePAD_a_OBJECTS)
-
-libOnePAD_a_SOURCES = joystick.cpp analog.cpp analog.h onepad.cpp onepad.h controller.cpp controller.h \
-Linux/gui.cpp Linux/linux.cpp  Linux/support.c Linux/interface.c Linux/ini.cpp keyboard.cpp keyboard.h

plugins/onepad/aclocal.m4

@@ -1,973 +0,0 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
-[m4_warning([this file was generated for autoconf 2.63.
-You have another version of autoconf.  It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
-
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-
-# Figure out how to run the assembler.                      -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_PROG_AS
-# ----------
-AC_DEFUN([AM_PROG_AS],
-[# By default we simply use the C compiler to build assembly code.
-AC_REQUIRE([AC_PROG_CC])
-test "${CCAS+set}" = set || CCAS=$CC
-test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
-AC_ARG_VAR([CCAS],      [assembler compiler command (defaults to CC)])
-AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)])
-_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl
-])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 9
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-m4_define([_AM_COND_VALUE_$1], [$2])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 10
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  am__universal=false
-  m4_case([$1], [CC],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac],
-    [CXX],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac])
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 5
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  do
-    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`AS_DIRNAME("$mf")`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`AS_DIRNAME(["$file"])`
-      AS_MKDIR_P([$dirpart/$fdir])
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
-  done
-}
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 16
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-			     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES(CC)],
-		  [define([AC_PROG_CC],
-			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES(CXX)],
-		  [define([AC_PROG_CXX],
-			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES(OBJC)],
-		  [define([AC_PROG_OBJC],
-			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
-AC_CONFIG_COMMANDS_PRE(dnl
-[m4_provide_if([_AM_COMPILER_EXEEXT],
-  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
-
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-dnl mangled by Autoconf and run in a shell conditional statement.
-m4_define([_AC_COMPILER_EXEEXT],
-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_arg=$1
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 6
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[[\\\"\#\$\&\'\`$am_lf]]*)
-    AC_MSG_ERROR([unsafe absolute working directory name]);;
-esac
-case $srcdir in
-  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
-esac
-
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Public sister of _AM_SUBST_NOTMAKE.
-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-

plugins/onepad/build.sh

@@ -1,29 +0,0 @@
-#!/bin/sh
-
-curdir=`pwd`
-
-echo ----------------
-echo Building OnePAD
-echo ----------------
-
-if [ $# -gt 0 ] && [ $1 = "all" ]
-then
-
-#if possible
-aclocal
-automake -a
-autoconf
-chmod +x configure
-./configure --prefix=${PCSX2PLUGINS}
-make clean
-make install
-
-else
-make $@
-fi
-
-if [ $? -ne 0 ]
-then
-exit 1
-fi
-

plugins/onepad/configure.ac

@@ -1,73 +0,0 @@
-AC_INIT(OnePAD,0.1,arcum42@gmail.com)
-
-AM_INIT_AUTOMAKE(OnePAD,0.1)
-
-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++])
-
-AC_PROG_INSTALL
-AC_PROG_RANLIB
-
-dnl necessary for compiling assembly
-AM_PROG_AS
-
-AC_SUBST(ONEPAD_CURRENT, 0)
-AC_SUBST(ONEPAD_REVISION, 1)
-AC_SUBST(ONEPAD_AGE, 0)
-AC_SUBST(ONEPAD_RELEASE, [$ONEPAD_CURRENT].[$ONEPAD_REVISION].[$ONEPAD_AGE])
-AC_SUBST(ONEPAD_SONAME, libOnePAD.so.[$ONEPAD_CURRENT].[$ONEPAD_REVISION].[$ONEPAD_AGE])
-
-CFLAGS=
-CXXFLAGS=
-CCASFLAGS=
-
-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(PCSX2_DEBUG,1,[PCSX2_DEBUG])
- CFLAGS+="-g -m32 -fpic "
- CXXFLAGS+="-g -m32 -fpic "
- CCASFLAGS+=" -m32 -fpic "
-else
- AC_DEFINE(NDEBUG,1,[NDEBUG])
- CFLAGS+="-O2 -fomit-frame-pointer -m32 -fpic "
- CXXFLAGS+="-O2 -fomit-frame-pointer -m32 -fpic "
- CCASFLAGS+=" -m32 -fpic "
-fi
-AM_CONDITIONAL(DEBUGBUILD, test x$debug = xyes)
-AC_MSG_RESULT($debug)
-
-
-AC_CHECK_FUNCS([ _aligned_malloc _aligned_free ], AC_DEFINE(HAVE_ALIGNED_MALLOC))
-
-AC_CHECK_LIB(SDL,SDL_Init,[])
-
-dnl gtk
-AC_MSG_CHECKING(gtk2+)
-AC_CHECK_PROG(GTK_CONFIG, pkg-config, pkg-config)
-LIBS+=$(pkg-config --libs gtk+-2.0 sdl)
-CFLAGS+="$(pkg-config --cflags gtk+-2.0 sdl) "
-CXXFLAGS+="$(pkg-config --cflags gtk+-2.0 sdl) "
-
-dnl AC_CHECK_HEADER([SDL/SDL.h], [AC_DEFINE(JOYSTICK_SUPPORT,1)])
-
-dnl assuming linux environment
-so_ext=".so.$ONEPAD_RELEASE"
-SHARED_LDFLAGS="-shared"
-AC_SUBST(so_ext)
-AC_SUBST(SHARED_LDFLAGS)
-
-AC_CHECK_LIB(stdc++,main,[LIBS="$LIBS -lstdc++"])
-AC_CHECK_LIB(dl,main,[LIBS="$LIBS -ldl"])
-
-
-AC_OUTPUT([
- Makefile
- ])
-
-echo "Configuration:"
-echo "  Debug build?	       $debug"

plugins/onepad/depcomp

@@ -1,529 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-# 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 this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit $?
-    ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
-  if test "$libtool" = yes; then
-    "$@" -Wc,-M
-  else
-    "$@" -M
-  fi
-  stat=$?
-
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-
-  if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mecanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no
-  for arg in "$@"; do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  "$@" || exit $?
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

plugins/onepad/install-sh

@@ -1 +0,0 @@
-/usr/share/automake-1.11/install-sh

plugins/onepad/missing

@@ -1 +0,0 @@
-/usr/share/automake-1.11/missing

plugins/spu2-x/src/CMakeLists.txt

@@ -11,7 +11,6 @@ set(spu2xName spu2x)
 
 set(CommonFlags
     -Wall
-    -m32
     -msse2
     )
 
@@ -127,11 +126,3 @@ target_link_libraries(${spu2xName} ${SOUNDTOUCH_LIBRARIES})
 
 # link target with A52
 target_link_libraries(${spu2xName} ${A52_LIBRARIES})
-
-# Force the linker into 32 bits mode
-target_link_libraries(${spu2xName} -m32)
-
-# Linker strip option
-if (CMAKE_BUILD_STRIP)
-    target_link_libraries(${spu2xName} -s)
-endif (CMAKE_BUILD_STRIP)

plugins/zerogs/opengl/CMakeLists.txt

@@ -5,7 +5,6 @@ set(zerogsName zerogs)
 
 set(CommonFlags
     -Wall
-    -m32
     )
 
 set(OptimizationFlags
@@ -138,11 +137,3 @@ target_link_libraries(${zerogsName} ${X11_LIBRARIES})
 
 # link target with X11 videomod
 target_link_libraries(${zerogsName} ${X11_Xxf86vm_LIB})
-
-# Force the linker into 32 bits mode
-target_link_libraries(${zerogsName} -m32)
-
-# Linker strip option
-if (CMAKE_BUILD_STRIP)
-    target_link_libraries(${zerogsName} -s)
-endif (CMAKE_BUILD_STRIP)

plugins/zeropad/CMakeLists.txt

@@ -11,7 +11,6 @@ set(zeropadName zeropad)
 
 set(CommonFlags
     -Wall
-    -m32
     -fpic
     )
 
@@ -97,11 +96,3 @@ set_target_properties(${zeropadName} PROPERTIES
 
 # link target with SDL
 target_link_libraries(${zeropadName} ${SDL_LIBRARY})
-
-# Force the linker into 32 bits mode
-target_link_libraries(${zeropadName} -m32)
-
-# Linker strip option
-if (CMAKE_BUILD_STRIP)
-    target_link_libraries(${zeropadName} -s)
-endif (CMAKE_BUILD_STRIP)

plugins/zerospu2/CMakeLists.txt

@@ -11,7 +11,6 @@ set(zerospu2Name zerospu2)
 
 set(CommonFlags
     -Wall
-    -m32
     -msse2
     )
 
@@ -107,11 +106,3 @@ endif(PORTAUDIO_FOUND)
 
 # link target with SoundTouch
 target_link_libraries(${zerospu2Name} ${SOUNDTOUCH_LIBRARIES})
-
-# Force the linker into 32 bits mode
-target_link_libraries(${zerospu2Name} -m32)
-
-# Linker strip option
-if (CMAKE_BUILD_STRIP)
-    target_link_libraries(${zerospu2Name} -s)
-endif (CMAKE_BUILD_STRIP)

plugins/zerospu2/Makefile.am

@@ -1,29 +0,0 @@
-# Create a shared library libZeroSPU2
-AUTOMAKE_OPTIONS = foreign
-noinst_LIBRARIES = libZeroSPU2.a
-INCLUDES = -I@srcdir@/../../common/include -I@srcdir@/../../3rdparty
-
-libZeroSPU2_a_CXXFLAGS = $(shell pkg-config --cflags gtk+-2.0)
-libZeroSPU2_a_CFLAGS = $(shell pkg-config --cflags gtk+-2.0)
-
-# Create a shared object by faking an exe (thanks to ODE makefiles)
-traplibdir=$(prefix)
-
-if DEBUGBUILD
-preext=d
-endif
-
-EXEEXT=$(preext)@so_ext@
-
-traplib_PROGRAMS=libZeroSPU2
-libZeroSPU2_SOURCES=
-libZeroSPU2_DEPENDENCIES = libZeroSPU2.a libSoundTouch.a
-libZeroSPU2_LDFLAGS= @SHARED_LDFLAGS@
-libZeroSPU2_LDFLAGS+=-Wl,-soname,@ZEROSPU2_SONAME@
-libZeroSPU2_LDADD=$(libZeroSPU2_a_OBJECTS) libSoundTouch.a
-
-libZeroSPU2_a_SOURCES = zerospu2.cpp voices.cpp zerodma.cpp zeroworker.cpp
-libZeroSPU2_a_SOURCES += zerospu2.h reg.h misc.h zerodma.h zeroworker.h
-libZeroSPU2_a_SOURCES += Linux/interface.c Linux/Linux.cpp Targets/Alsa.cpp Targets/OSS.cpp Targets/SoundTargets.cpp Linux/support.c
-
-#SUBDIRS = ../../3rdparty/SoundTouch

plugins/zerospu2/configure.ac

@@ -1,84 +0,0 @@
-AC_INIT(ZeroSPU2,0.1,zerofrog@gmail.com)
-
-AM_INIT_AUTOMAKE(ZeroSPU2,0.1)
-
-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++])
-
-AC_PROG_INSTALL
-AC_PROG_RANLIB
-
-dnl necessary for compiling assembly
-AM_PROG_AS
-
-AC_SUBST(ZEROSPU2_CURRENT, 0)
-AC_SUBST(ZEROSPU2_REVISION, 1)
-AC_SUBST(ZEROSPU2_AGE, 0)
-AC_SUBST(ZEROSPU2_RELEASE, [$ZEROSPU2_CURRENT].[$ZEROSPU2_REVISION].[$ZEROSPU2_AGE])
-AC_SUBST(ZEROSPU2_SONAME, libZeroSPU2.so.[$ZEROSPU2_CURRENT].[$ZEROSPU2_REVISION].[$ZEROSPU2_AGE])
-
-CFLAGS=
-CPPFLAGS=
-CXXFLAGS=
-CCASFLAGS=
-
-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(PCSX2_DEBUG,1,[PCSX2_DEBUG])
- CFLAGS+="-g -fPIC -Wall  -Wno-unused-value -m32 "
- CPPFLAGS+="-g -fPIC -Wall  -Wno-unused-value -m32 "
- CXXFLAGS+="-g -fPIC -Wall  -Wno-unused-value -m32 "
- CCASFLAGS+=" -m32 "
-else
- AC_DEFINE(NDEBUG,1,[NDEBUG])
- CFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall  -Wno-unused-value -m32 "
- CPPFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall  -Wno-unused-value -m32 "
- CXXFLAGS+="-O3 -fomit-frame-pointer -fPIC -Wall  -Wno-unused-value -m32 "
- CCASFLAGS+=" -m32 "
-fi
-AM_CONDITIONAL(DEBUGBUILD, test x$debug = xyes)
-AC_MSG_RESULT($debug)
-
-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" == xyes
-then
- AC_DEFINE(ZEROSPU2_DEVBUILD,1,[ZEROSPU2_DEVBUILD])
-fi
-AC_MSG_RESULT($devbuild)
-AM_CONDITIONAL(RELEASE_TO_PUBLIC, test x$devbuild = xno)
-
-AC_CHECK_FUNCS([ _aligned_malloc _aligned_free ], AC_DEFINE(HAVE_ALIGNED_MALLOC))
-
-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.$ZEROSPU2_RELEASE"
-SHARED_LDFLAGS="-shared"
-AC_SUBST(so_ext)
-AC_SUBST(SHARED_LDFLAGS)
-
-AC_CHECK_LIB(stdc++,main,[LIBS="$LIBS -lstdc++"])
-AC_CHECK_LIB(dl,main,[LIBS="$LIBS -ldl"])
-AC_CHECK_LIB(asound,main,[LIBS="$LIBS -lasound"])
-
-AC_OUTPUT([
- Makefile
- ])
-
-echo "Configuration:"
-echo "  Debug build?	       $debug"
-echo "  Dev build?	       $devbuild"
-echo "  x86-64 build?	       $cpu64"

plugins/zerospu2/depcomp

@@ -1,529 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-# 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 this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit $?
-    ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
-  if test "$libtool" = yes; then
-    "$@" -Wc,-M
-  else
-    "$@" -M
-  fi
-  stat=$?
-
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-
-  if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mecanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no
-  for arg in "$@"; do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  "$@" || exit $?
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

plugins/zerospu2/install-sh

@@ -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:

plugins/zerospu2/missing

@@ -1,360 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2005-06-08.21
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-#   Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# 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 this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case "$1" in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).
-case "$1" in
-  lex|yacc)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f y.tab.h ]; then
-	echo >y.tab.h
-    fi
-    if [ ! -f y.tab.c ]; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f lex.yy.c ]; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  tar)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case "$firstarg" in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case "$firstarg" in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-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:

plugins/zzogl-pg/opengl/CMakeLists.txt

@@ -11,7 +11,6 @@ set(zzoglName zzogl)
 
 set(CommonFlags
     -pthread
-    -m32
     -Wno-format
     -Wno-unused-parameter
     -Wno-unused-value
@@ -158,11 +157,3 @@ target_link_libraries(${zzoglName} ${X11_LIBRARIES})
 
 # link target with X11 videomod
 target_link_libraries(${zzoglName} ${X11_Xxf86vm_LIB})
-
-# Force the linker into 32 bits mode
-target_link_libraries(${zzoglName} -m32)
-
-# Linker strip option
-if (CMAKE_BUILD_STRIP)
-    target_link_libraries(${zzoglName} -s)
-endif (CMAKE_BUILD_STRIP)