diff --git a/cmake/BuildParameters.cmake b/cmake/BuildParameters.cmake index 42cf161ed9..15ac3b24c6 100644 --- a/cmake/BuildParameters.cmake +++ b/cmake/BuildParameters.cmake @@ -35,6 +35,7 @@ option(GLSL_API "Replace ZZogl CG backend by GLSL (experimental option)") option(EGL_API "Use EGL on ZZogl/GSdx (experimental/developer option)") option(REBUILD_SHADER "Rebuild GLSL/CG shader (developer option)") option(BUILD_REPLAY_LOADERS "Build GS replayer to ease testing (developer option)") +option(GSDX_LEGACY "Build a GSdx legacy plugin compatible with GL3.3") #------------------------------------------------------------------------------- # Path and lib option diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index 40cf529f0b..b294cc7e5f 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -631,7 +631,7 @@ set(pcsx2FinalLibs ) if(BUILTIN_GS) - set(pcsx2FinalLibs "${pcsx2FinalLibs} GSdx-1.0.0") + set(pcsx2FinalLibs "${pcsx2FinalLibs} GSdx") endif() if(BUILTIN_PAD) set(pcsx2FinalLibs "${pcsx2FinalLibs} onepad-1.2.0") diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 4cfe70b136..612a33150e 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -46,6 +46,10 @@ if(EXISTS "${CMAKE_SOURCE_DIR}/plugins/GSdx" AND GSdx) add_subdirectory(GSdx) endif() +if(EXISTS "${CMAKE_SOURCE_DIR}/plugins/GSdx_legacy" AND GSdx AND GSDX_LEGACY) + add_subdirectory(GSdx_legacy) +endif() + if(EXISTS "${CMAKE_SOURCE_DIR}/plugins/GSnull" AND GSnull) add_subdirectory(GSnull) endif() diff --git a/plugins/GSdx/CMakeLists.txt b/plugins/GSdx/CMakeLists.txt index 20cbd9e61b..5ea49d7606 100644 --- a/plugins/GSdx/CMakeLists.txt +++ b/plugins/GSdx/CMakeLists.txt @@ -6,8 +6,8 @@ if(NOT TOP_CMAKE_WAS_SOURCED) endif() -# plugin name -set(Output GSdx-1.0.0) +# plugin name (no version number to ease future version bump and bisect) +set(Output GSdx) set(CommonFlags -fno-operator-names # because Xbyak uses and()/xor()/or()/not() function diff --git a/plugins/GSdx/GS.cpp b/plugins/GSdx/GS.cpp index 0eecf951b8..89dc42c51f 100644 --- a/plugins/GSdx/GS.cpp +++ b/plugins/GSdx/GS.cpp @@ -83,7 +83,7 @@ EXPORT_C_(const char*) PS2EgetLibName() EXPORT_C_(uint32) PS2EgetLibVersion2(uint32 type) { const uint32 revision = 1; - const uint32 build = 0; + const uint32 build = 1; return (build << 0) | (revision << 8) | (PS2E_GS_VERSION << 16) | (PLUGIN_VERSION << 24); }