From what I know, this was only need for Windows XP because of Direct…

…X 9 had restrictions and problems with devices (device lost, etc)
sobkas · Dec 17, 2021 · a7ff45c · a7ff45c
1 parent 5843938
commit a7ff45c
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 66 deletions.
diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml
@@ -79,13 +79,13 @@ jobs:
         mkdir bin && cd bin
         if [ "${{ matrix.Platform }}" = "x64" ]; then
         sudo apt-get update &&
-        sudo apt-get install -y libglew-dev libegl1-mesa-dev libgles2-mesa-dev libopenal-dev libcrypto++-dev liblockfile-dev libfreeimage-dev libfreeimageplus-dev &&
+        sudo apt-get install -y libglew-dev libegl1-mesa-dev libgles2-mesa-dev libopenal-dev libcrypto++-dev libfreeimage-dev libfreeimageplus-dev &&
         sudo apt-get install -y cmake liblua5.1-0-dev libogg-dev libtheora-dev libvorbis-dev liblzo2-dev libjpeg-dev libncurses5-dev libsdl2-dev &&
         CFLAGS="-w" CXXFLAGS="-w" cmake .. -DCMAKE_BUILD_TYPE=${{ matrix.Configuration }}
         fi
         if [ "${{ matrix.Platform }}" = "x86" ]; then
         sudo dpkg --add-architecture i386 && sudo apt-get -qq update && sudo apt-get install -y gcc-multilib g++-9-multilib libpulse-dev:i386 libglib2.0-dev:i386 &&
-        sudo apt-get install -y libglew-dev:i386 libegl1-mesa-dev:i386 libgles2-mesa-dev:i386 libopenal-dev:i386 libcrypto++-dev:i386 liblockfile-dev:i386 libfreeimage-dev:i386 libfreeimageplus-dev:i386 &&
+        sudo apt-get install -y libglew-dev:i386 libegl1-mesa-dev:i386 libgles2-mesa-dev:i386 libopenal-dev:i386 libcrypto++-dev:i386 libfreeimage-dev:i386 libfreeimageplus-dev:i386 &&
         sudo apt-get install -y cmake liblua5.1-0-dev:i386 libogg-dev:i386 libtheora-dev:i386 libvorbis-dev:i386 liblzo2-dev:i386 libjpeg-dev:i386 libncurses5-dev:i386 libsdl2-dev:i386 &&
         CFLAGS="-m32 -w" CXXFLAGS="-m32 -w" cmake .. -DCMAKE_BUILD_TYPE=${{ matrix.Configuration }} -DCPACK_DEBIAN_PACKAGE_ARCHITECTURE=i386 -DCMAKE_ASM_FLAGS=-m32
         fi

diff --git a/.travis.yml b/.travis.yml
@@ -74,7 +74,7 @@ before_script:
   - mkdir bin && cd bin
 
   - if [ $TARGET_CPU == x64 ]; then
-       sudo apt-get install -y libegl1-mesa-dev libgles2-mesa-dev libopenal-dev libcrypto++-dev liblockfile-dev libfreeimage3 libfreeimage-dev libfreeimageplus-dev liblua5.1-0-dev libssl-dev libogg-dev libtheora-bin libtheora-dev libvorbis-dev liblzo2-dev libjpeg-dev libncurses5-dev libpcre3-dev libsdl2-2.0-0 libsdl2-dev libgl1 libgl1-mesa-dev libgl1-mesa-dev libgl-dev;
+       sudo apt-get install -y libegl1-mesa-dev libgles2-mesa-dev libopenal-dev libcrypto++-dev libfreeimage3 libfreeimage-dev libfreeimageplus-dev liblua5.1-0-dev libssl-dev libogg-dev libtheora-bin libtheora-dev libvorbis-dev liblzo2-dev libjpeg-dev libncurses5-dev libpcre3-dev libsdl2-2.0-0 libsdl2-dev libgl1 libgl1-mesa-dev libgl1-mesa-dev libgl-dev;
 
        if [ $TRAVIS_CPU_ARCH == arm64 ]; then
           sudo apt-get install -y snapd

diff --git a/ArchLinux/PKGBUILD b/ArchLinux/PKGBUILD
@@ -14,7 +14,7 @@ url="https://github.com/OpenXRay/xray-16"
 license=('custom:Custom 3-сlause BSD')
 install="info.install"
 makedepends=(gcc git cmake libglvnd libjpeg6-turbo ncurses pcre2 pcre)
-depends=(glew sdl2 openal crypto++ liblockfile freeimage libogg libtheora libvorbis lzo lzop libjpeg-turbo)
+depends=(glew sdl2 openal crypto++ freeimage libogg libtheora libvorbis lzo lzop libjpeg-turbo)
 conflicts=(openxray openxray-git)
 
 pkgver() {

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -209,7 +209,6 @@ if (NOT WIN32)
     find_package(GLEW REQUIRED)
     find_package(FreeImage REQUIRED)
     find_package(FreeImagePlus REQUIRED)
-    find_package(LockFile REQUIRED)
     find_package(OpenAL REQUIRED)
     if (USE_CRYPTOPP)
         find_package(Crypto++ REQUIRED)

diff --git a/appveyor.yml b/appveyor.yml
@@ -72,14 +72,14 @@ for:
     - sh: |
         if [ "$PLATFORM" = "x64" ]; then
         sudo apt-get update &&
-        sudo apt-get install -y libglew-dev libegl1-mesa-dev libgles2-mesa-dev libopenal-dev libcrypto++-dev liblockfile-dev libfreeimage-dev libfreeimageplus-dev &&
+        sudo apt-get install -y libglew-dev libegl1-mesa-dev libgles2-mesa-dev libopenal-dev libcrypto++-dev libfreeimage-dev libfreeimageplus-dev &&
         sudo apt-get install -y liblua5.1-0-dev libssl-dev libogg-dev libtheora-dev libvorbis-dev liblzo2-dev libjpeg-dev libncurses5-dev libsdl2-dev &&
         CFLAGS="-w" CXXFLAGS="-w" cmake .. -DCMAKE_BUILD_TYPE=$BUILD_CONFIGURATION
         fi
     - sh: |
         if [ "$PLATFORM" = "x86" ]; then
         sudo dpkg --add-architecture i386 && sudo apt-get -qq update && sudo apt-get remove -y libllvm10 libgl1 libgl1-mesa-dri && sudo apt-get install -y gcc-multilib g++-8-multilib &&
-        sudo apt-get install -y libglew-dev:i386 libegl1-mesa-dev:i386 libgles2-mesa-dev:i386 libopenal-dev:i386 libcrypto++-dev:i386 liblockfile-dev:i386 libfreeimage-dev:i386 libfreeimageplus-dev:i386 &&
+        sudo apt-get install -y libglew-dev:i386 libegl1-mesa-dev:i386 libgles2-mesa-dev:i386 libopenal-dev:i386 libcrypto++-dev:i386 libfreeimage-dev:i386 libfreeimageplus-dev:i386 &&
         sudo apt-get install -y liblua5.1-0-dev:i386 libssl-dev:i386 libogg-dev:i386 libtheora-dev:i386 libvorbis-dev:i386 liblzo2-dev:i386 libjpeg-dev:i386 libncurses5-dev:i386 libsdl2-dev:i386 &&
         CFLAGS="-m32 -w" CXXFLAGS="-m32 -w" cmake .. -DCMAKE_BUILD_TYPE=$BUILD_CONFIGURATION -DCPACK_DEBIAN_PACKAGE_ARCHITECTURE=i386 -DCMAKE_ASM_FLAGS=-m32
         fi

diff --git a/cmake/FindLockFile.cmake b/cmake/FindLockFile.cmake
diff --git a/debian/control b/debian/control
@@ -2,11 +2,11 @@ Source: openxray
 Section: games
 Priority: optional
 Maintainer: lya Orlov <[email protected]>
-Build-Depends: cmake, build-essential, libglew-dev, libegl1-mesa-dev, libgles2-mesa-dev, libopenal-dev, libcrypto++-dev, liblockfile-dev, libfreeimage-dev, libfreeimageplus-dev, libogg-dev, libtheora-dev, libvorbis-dev, liblzo2-dev, libjpeg-dev, libncurses5-dev, gcc-8, libpcre3-dev, libsdl2-dev, g++-8, debhelper, lsb-release
+Build-Depends: cmake, build-essential, libglew-dev, libegl1-mesa-dev, libgles2-mesa-dev, libopenal-dev, libcrypto++-dev, libfreeimage-dev, libfreeimageplus-dev, libogg-dev, libtheora-dev, libvorbis-dev, liblzo2-dev, libjpeg-dev, libncurses5-dev, gcc-8, libpcre3-dev, libsdl2-dev, g++-8, debhelper, lsb-release
 Homepage: https://github.com/OpenXRay/xray-16
 
 Package: openxray
 Architecture: any
-Depends: libc6, libsdl2-2.0-0, libopenal1, libcrypto++6, liblockfile1, libfreeimage3, libfreeimageplus3, liblua5.1-0, libogg0, libtheora0, libvorbis0a, liblzo2-2, libjpeg-turbo8, libglew2.0
+Depends: libc6, libsdl2-2.0-0, libopenal1, libcrypto++6, libfreeimage3, libfreeimageplus3, liblua5.1-0, libogg0, libtheora0, libvorbis0a, liblzo2-2, libjpeg-turbo8, libglew2.0
 Description: X-Ray Engine 1.6 expansion
  X-Ray Engine sources based on version 1.6.02. The original engine is used in S.T.A.L.K.E.R.: Call of Pripyat game released by GSC Game World.
diff --git a/docker/image/install_deps.sh b/docker/image/install_deps.sh
@@ -33,7 +33,6 @@ apt-get install -y \
   libglew-dev \
   libfreeimage-dev \
   libfreeimageplus-dev \
-  liblockfile-dev \
   libopenal-dev \
   libcrypto++-dev \
   libogg-dev \

diff --git a/src/xrEngine/CMakeLists.txt b/src/xrEngine/CMakeLists.txt
@@ -180,7 +180,6 @@ target_include_directories(${PROJECT_NAME}
     ${SDL_INCLUDE_DIRS}
     ${FREEIMAGE_INCLUDE_PATH}
     ${FREEIMAGEPLUS_INCLUDE_PATH}
-    ${LOCKFILE_INCLUDE_DIR}
 )
 
 target_link_libraries(${PROJECT_NAME}
@@ -200,7 +199,6 @@ target_link_libraries(${PROJECT_NAME}
     ${OGG_LIBRARIES}
     xrCDB
     openal
-    ${LOCKFILE_LIBRARIES}
     ${SDL_LIBRARIES}
 )
 

diff --git a/src/xrEngine/main.cpp b/src/xrEngine/main.cpp
@@ -4,8 +4,6 @@
 
 #if defined(XR_PLATFORM_WINDOWS)
 #include <process.h>
-#elif defined(XR_PLATFORM_LINUX)
-#include <lockfile.h>
 #endif
 #include <locale.h>
 
@@ -31,10 +29,6 @@
 
 #include "xrCore/Threading/TaskManager.hpp"
 
-#ifdef MASTER_GOLD
-#define NO_MULTI_INSTANCES
-#endif
-
 // global variables
 ENGINE_API CInifile* pGameIni = nullptr;
 ENGINE_API bool g_bBenchmark = false;
@@ -209,9 +203,6 @@ ENGINE_API void destroyEngine()
 {
     Device.Destroy();
     Engine.Destroy();
-#if defined(XR_PLATFORM_LINUX)
-    lockfile_remove("/var/lock/stalker-cop.lock");
-#endif
 }
 
 void execUserScript()
@@ -346,20 +337,6 @@ ENGINE_API int RunApplication()
 {
     R_ASSERT2(Core.Params, "Core must be initialized");
 
-#ifdef NO_MULTI_INSTANCES
-    if (!GEnv.isDedicatedServer)
-    {
-#if defined(XR_PLATFORM_WINDOWS)
-        CreateMutex(nullptr, true, "Local\\STALKER-COP");
-        if (GetLastError() == ERROR_ALREADY_EXISTS)
-            return 2;
-#elif defined(XR_PLATFORM_LINUX)
-        int lock_res = lockfile_create("/var/lock/stalker-cop.lock", 0, L_PID);
-        if(L_ERROR == lock_res)
-            return 2;
-#endif
-    }
-#endif
     *g_sLaunchOnExit_app = 0;
     *g_sLaunchOnExit_params = 0;