Apply gregory's cmake patch to fix it to compile with recent revisions. (Note: still unsupported.)

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

3rdparty/SoundTouch/CMakeLists.txt

@@ -6,19 +6,19 @@ set(SoundTouchName SoundTouch)
 # Debug - Build
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
 	# add defines
-	add_definitions(-g -O0 -march=athlon-xp -march=prescott)
+	add_definitions(-g -O0 -march=athlon-xp -march=prescott -m32)
 endif(CMAKE_BUILD_TYPE STREQUAL Debug)
 
 # Devel - Build
 if(CMAKE_BUILD_TYPE STREQUAL Devel)
 	# add defines
-	add_definitions(-O1 -g -W -march=athlon-xp -march=prescott)
+	add_definitions(-O1 -g -W -march=athlon-xp -march=prescott -m32)
 endif(CMAKE_BUILD_TYPE STREQUAL Devel)
 
 # Release - Build
 if(CMAKE_BUILD_TYPE STREQUAL Release)
 	# add defines
-	add_definitions(-fexpensive-optimizations -O3 -Os -W -march=athlon-xp -march=prescott)
+	add_definitions(-fexpensive-optimizations -O3 -Os -W -march=athlon-xp -march=prescott -m32)
 endif(CMAKE_BUILD_TYPE STREQUAL Release)
 
 # variable with all sources of this library

cmake/SearchForStuff.cmake

@@ -80,6 +80,10 @@ if(Linux)			# Linux only
 	endif(X11_FOUND)
 endif(Linux)
 
+    # Manually find Xxf86vm because it is not done in the module...
+    FIND_LIBRARY(X11_Xxf86vm_LIB Xxf86vm       ${X11_LIB_SEARCH_PATH})
+    MARK_AS_ADVANCED(X11_Xxf86vm_LIB)
+
 #------------------------------------------------------------
 
 # ALSA optional
@@ -153,6 +157,7 @@ endif(PORTAUDIO_FOUND)
 #------------------------------------------------------------
 
 # SDL optional
+set(SDL_BUILDING_LIBRARY TRUE)
 find_package(SDL)
 
 # SDL found

common/src/Utilities/CMakeLists.txt

@@ -119,6 +119,7 @@ set(UtilitiesSources
 	pxStaticText.cpp
 	Semaphore.cpp
 	StringHelpers.cpp
+	ThreadingDialogs.cpp
 	ThreadTools.cpp
 	vssprintf.cpp
 	wxAppWithHelpers.cpp
@@ -153,6 +154,7 @@ set(UtilitiesHeaders
 	../../include/Utilities/ScopedPtr.h
 	../../include/Utilities/StringHelpers.h
 	../../include/Utilities/Threading.h
+	../../include/Utilities/ThreadingDialogs.h
 	../../include/Utilities/wxAppWithHelpers.h
 	../../include/Utilities/wxBaseTools.h
 	../../include/Utilities/wxGuiTools.h

pcsx2/CMakeLists.txt

@@ -156,7 +156,6 @@ set(pcsx2Sources
 	R5900.cpp
 	R5900OpcodeImpl.cpp
 	R5900OpcodeTables.cpp
-	RecoverySystem.cpp
 	SaveState.cpp
 	ShiftJisToUnicode.cpp
 	Sif.cpp
@@ -167,7 +166,6 @@ set(pcsx2Sources
 	SPR.cpp
 	Stats.cpp
 	System.cpp
-	Vif_Commands.cpp
 	Vif0_Dma.cpp
 	Vif1_Dma.cpp
 	Vif1_MFIFO.cpp
@@ -288,6 +286,7 @@ set(pcsx2GuiSources
 	gui/AdvancedDialog.cpp
 	gui/AppAssert.cpp
 	gui/AppConfig.cpp
+	gui/AppCorePlugins.cpp
 	gui/AppCoreThread.cpp
 	gui/AppEventSources.cpp
 	gui/AppInit.cpp
@@ -308,9 +307,11 @@ set(pcsx2GuiSources
 	gui/Dialogs/FirstTimeWizard.cpp
 	gui/Dialogs/ImportSettingsDialog.cpp
 	gui/Dialogs/LogOptionsDialog.cpp
+	gui/Dialogs/McdConfigDialog.cpp
 	gui/Dialogs/PickUserModeDialog.cpp
 	gui/Dialogs/StuckThreadDialog.cpp
 	gui/Dialogs/SysConfigDialog.cpp
+	gui/ExecutorThread.cpp
 	gui/FrameForGS.cpp
 	gui/GlobalCommands.cpp
 	gui/i18n.cpp
@@ -319,8 +320,8 @@ set(pcsx2GuiSources
 	gui/MainFrame.cpp
 	gui/MainMenuClicks.cpp
 	gui/MemoryCardFile.cpp
+	gui/Panels/BaseApplicableConfigPanel.cpp
 	gui/Panels/MemoryCardListPanel.cpp
-	gui/Panels/MemoryCardListView.h
 	gui/MessageBoxes.cpp
 	gui/MSWstuff.cpp
 	gui/Panels/AudioPanel.cpp
@@ -336,10 +337,11 @@ set(pcsx2GuiSources
 	gui/Panels/PluginSelectorPanel.cpp
 	gui/Panels/SpeedhacksPanel.cpp
 	gui/Panels/VideoPanel.cpp
-	gui/Plugins.cpp
 	gui/pxLogTextCtrl.cpp
 	gui/RecentIsoList.cpp
 	gui/Saveslots.cpp
+	gui/SysState.cpp
+	gui/UpdateUI.cpp
 	)
 
 # gui headers
@@ -349,6 +351,7 @@ set(pcsx2GuiHeaders
 	gui/ApplyState.h
 	gui/AppCommon.h
 	gui/AppConfig.h
+	gui/AppCorePlugins.h
 	gui/AppEventListeners.h
 	gui/AppForwardDefs.h
 	gui/ConsoleLogger.h
@@ -363,6 +366,7 @@ set(pcsx2GuiHeaders
 	gui/MSWstuff.h
 	gui/Panels/ConfigurationPanels.h
 	gui/Panels/LogOptionsPanels.h
+	gui/Panels/MemoryCardPanels.h
 	gui/RecentIsoList.h
 	)
 
@@ -441,6 +445,16 @@ set(pcsx2UtilitiesSources
 set(pcsx2UtilitiesHeaders
 	Utilities/AsciiFile.h)
 
+# Zip tools utilies sources
+set(pcsx2ZipToolsSources
+    ZipTools/thread_gzip.cpp
+    ZipTools/thread_lzma.cpp)
+
+# Zip tools utilies headers
+set(pcsx2ZipToolsHeaders
+    ZipTools/ThreadedZipTools.h)
+
+
 # Windows sources
 set(pcsx2WindowsSources
 	windows/cheats/browser.cpp
@@ -572,6 +586,8 @@ set(Common
 	${pcsx2UtilitiesHeaders}
 	${pcsx2x86Sources}
 	${pcsx2x86Headers}
+	${pcsx2ZipToolsSources}
+	${pcsx2ZipToolsHeaders}
 	${pcsx2SSources})
 
 # platform sources

plugins/CDVDiso/CMakeLists.txt

@@ -0,0 +1,2 @@
+# CDVDiso plugin
+add_subdirectory(src)

plugins/CDVDiso/src/CMakeLists.txt

@@ -0,0 +1,69 @@
+# CDVDiso Plugin
+
+# plugin name
+set(CDVDisoName CDVDiso)
+
+# Debug - Build
+if(CMAKE_BUILD_TYPE STREQUAL Debug)
+    # add defines
+    add_definitions(-Wall -m32 -g -fpic -fpermissive)
+endif(CMAKE_BUILD_TYPE STREQUAL Debug)
+
+# Devel - Build
+if(CMAKE_BUILD_TYPE STREQUAL Devel)
+    # add defines
+    add_definitions(-Wall -m32 -O2 -fpic -fomit-frame-pointer -fpermissive)
+endif(CMAKE_BUILD_TYPE STREQUAL Devel)
+
+# Release - Build
+if(CMAKE_BUILD_TYPE STREQUAL Release)
+    # add defines
+    add_definitions(-Wall -m32 -O2 -fpic -fomit-frame-pointer -fpermissive)
+endif(CMAKE_BUILD_TYPE STREQUAL Release)
+
+# CDVDiso sources
+set(CDVDisoSources
+    CDVDisop.cpp
+    libiso.cpp)
+
+# CDVDiso headers
+set(CDVDisoHeaders
+    CDVDiso.h
+    libiso.h)
+
+# CDVDiso Linux sources
+set(CDVDisoLinuxSources
+    Linux/Config.cpp
+    Linux/interface.c
+    Linux/Linux.cpp
+    Linux/support.c)
+
+# CDVDiso Linux headers
+set(CDVDisoLinuxHeaders
+    Linux/callbacks.h
+    Linux/Config.h
+    Linux/interface.h
+    Linux/support.h)
+
+
+# add additional include directories
+include_directories(.
+    Linux)
+
+# add library
+add_library(${CDVDisoName} SHARED
+			${CDVDisoSources}
+			${CDVDisoHeaders}
+			${CDVDisoLinuxSources}
+			${CDVDisoLinuxHeaders})
+
+# set output directory
+set_target_properties(${CDVDisoName} PROPERTIES
+					  LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)
+
+# Link with bz2
+target_link_libraries(${CDVDisoName} ${BZIP2_LIBRARIES})
+
+# Set link flags
+target_link_libraries(${CDVDisoName} -m32)
+

plugins/zerogs/opengl/GLWinX11.cpp

@@ -110,7 +110,7 @@ void GLWindow::DisplayWindow(int _width, int _height)
 	if (vi == NULL)
 	{
 		ERROR_LOG("Failed to get buffered Visual!\n");
-		return false;
+		return;
 	}
 
 	glXQueryVersion(glDisplay, &glxMajorVersion, &glxMinorVersion);

plugins/zeropad/CMakeLists.txt

@@ -0,0 +1,83 @@
+# zeropad Plugin
+
+# plugin name
+set(zeropadName zeropad)
+
+# Debug - Build
+if(CMAKE_BUILD_TYPE STREQUAL Debug)
+	# add defines
+	add_definitions(-Wall -m32 -g -fpic)
+endif(CMAKE_BUILD_TYPE STREQUAL Debug)
+
+# Devel - Build
+if(CMAKE_BUILD_TYPE STREQUAL Devel)
+	# add defines
+	add_definitions(-Wall -m32 -O2 -fpic -fomit-frame-pointer)
+endif(CMAKE_BUILD_TYPE STREQUAL Devel)
+
+# Release - Build
+if(CMAKE_BUILD_TYPE STREQUAL Release)
+	# add defines
+	add_definitions(-Wall -m32 -O2 -fpic -fomit-frame-pointer)
+endif(CMAKE_BUILD_TYPE STREQUAL Release)
+
+# zeropad sources
+set(zeropadSources
+    analog.cpp
+    joystick.cpp
+    keyboard.cpp
+    zeropad.cpp)
+
+# zeropad headers
+set(zeropadHeaders
+    analog.h
+    bitwise.h
+    joystick.h
+    keyboard.h
+    zeropad.h)
+
+# zeropad Linux sources
+set(zeropadLinuxSources
+    Linux/gui.cpp
+    Linux/linux.cpp
+    # Linux/callbacks.c
+    Linux/interface.c
+    Linux/support.c)
+
+# zeropad Linux headers
+set(zeropadLinuxHeaders
+    Linux/callbacks.h
+    Linux/interface.h
+    Linux/linux.h
+    Linux/support.h)
+
+# zeropad Windows sources
+set(zeropadWindowsSources
+    Windows/gui.cpp
+    Windows/win.cpp)
+
+# zeropad Windows headers
+set(zeropadWindowsHeaders
+    Windows/resource.h
+    Windows/win.h)
+
+# add additional include directories
+include_directories(.
+    Linux)
+
+# add library
+add_library(${zeropadName} SHARED
+			${zeropadSources}
+			${zeropadHeaders}
+			${zeropadLinuxSources}
+			${zeropadLinuxHeaders})
+
+# set output directory
+set_target_properties(${zeropadName} PROPERTIES
+					  LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)
+
+# link target with SDL
+target_link_libraries(${zeropadName} ${SDL_LIBRARY})
+
+# Set link flag
+target_link_libraries(${zeropadName} -m32)

plugins/zeropad/Linux/callbacks.h

@@ -1,5 +1,6 @@
 #include <gtk/gtk.h>
 
+#define VERSION "0.3"
 
 void
 OnAbout_Ok                             (GtkDialog       *dialog,