Skip to content

Commit a7ff45c

Browse files
committedDec 17, 2021
From what I know, this was only need for Windows XP because of DirectX 9 had restrictions and problems with devices (device lost, etc)
1 parent 5843938 commit a7ff45c

File tree

10 files changed

+8
-66
lines changed

10 files changed

+8
-66
lines changed
 

‎.github/workflows/cibuild.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,13 @@ jobs:
7979
mkdir bin && cd bin
8080
if [ "${{ matrix.Platform }}" = "x64" ]; then
8181
sudo apt-get update &&
82-
sudo apt-get install -y libglew-dev libegl1-mesa-dev libgles2-mesa-dev libopenal-dev libcrypto++-dev liblockfile-dev libfreeimage-dev libfreeimageplus-dev &&
82+
sudo apt-get install -y libglew-dev libegl1-mesa-dev libgles2-mesa-dev libopenal-dev libcrypto++-dev libfreeimage-dev libfreeimageplus-dev &&
8383
sudo apt-get install -y cmake liblua5.1-0-dev libogg-dev libtheora-dev libvorbis-dev liblzo2-dev libjpeg-dev libncurses5-dev libsdl2-dev &&
8484
CFLAGS="-w" CXXFLAGS="-w" cmake .. -DCMAKE_BUILD_TYPE=${{ matrix.Configuration }}
8585
fi
8686
if [ "${{ matrix.Platform }}" = "x86" ]; then
8787
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 &&
88-
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 &&
88+
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 &&
8989
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 &&
9090
CFLAGS="-m32 -w" CXXFLAGS="-m32 -w" cmake .. -DCMAKE_BUILD_TYPE=${{ matrix.Configuration }} -DCPACK_DEBIAN_PACKAGE_ARCHITECTURE=i386 -DCMAKE_ASM_FLAGS=-m32
9191
fi

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ before_script:
7474
- mkdir bin && cd bin
7575

7676
- if [ $TARGET_CPU == x64 ]; then
77-
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;
77+
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;
7878

7979
if [ $TRAVIS_CPU_ARCH == arm64 ]; then
8080
sudo apt-get install -y snapd

‎ArchLinux/PKGBUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ url="https://github.com/OpenXRay/xray-16"
1414
license=('custom:Custom 3-сlause BSD')
1515
install="info.install"
1616
makedepends=(gcc git cmake libglvnd libjpeg6-turbo ncurses pcre2 pcre)
17-
depends=(glew sdl2 openal crypto++ liblockfile freeimage libogg libtheora libvorbis lzo lzop libjpeg-turbo)
17+
depends=(glew sdl2 openal crypto++ freeimage libogg libtheora libvorbis lzo lzop libjpeg-turbo)
1818
conflicts=(openxray openxray-git)
1919

2020
pkgver() {

‎CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,6 @@ if (NOT WIN32)
209209
find_package(GLEW REQUIRED)
210210
find_package(FreeImage REQUIRED)
211211
find_package(FreeImagePlus REQUIRED)
212-
find_package(LockFile REQUIRED)
213212
find_package(OpenAL REQUIRED)
214213
if (USE_CRYPTOPP)
215214
find_package(Crypto++ REQUIRED)

‎appveyor.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,14 @@ for:
7272
- sh: |
7373
if [ "$PLATFORM" = "x64" ]; then
7474
sudo apt-get update &&
75-
sudo apt-get install -y libglew-dev libegl1-mesa-dev libgles2-mesa-dev libopenal-dev libcrypto++-dev liblockfile-dev libfreeimage-dev libfreeimageplus-dev &&
75+
sudo apt-get install -y libglew-dev libegl1-mesa-dev libgles2-mesa-dev libopenal-dev libcrypto++-dev libfreeimage-dev libfreeimageplus-dev &&
7676
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 &&
7777
CFLAGS="-w" CXXFLAGS="-w" cmake .. -DCMAKE_BUILD_TYPE=$BUILD_CONFIGURATION
7878
fi
7979
- sh: |
8080
if [ "$PLATFORM" = "x86" ]; then
8181
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 &&
82-
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 &&
82+
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 &&
8383
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 &&
8484
CFLAGS="-m32 -w" CXXFLAGS="-m32 -w" cmake .. -DCMAKE_BUILD_TYPE=$BUILD_CONFIGURATION -DCPACK_DEBIAN_PACKAGE_ARCHITECTURE=i386 -DCMAKE_ASM_FLAGS=-m32
8585
fi

‎cmake/FindLockFile.cmake

-31
This file was deleted.

‎debian/control

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ Source: openxray
22
Section: games
33
Priority: optional
44
Maintainer: lya Orlov <eagleivg@mail.ru>
5-
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
5+
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
66
Homepage: https://github.com/OpenXRay/xray-16
77

88
Package: openxray
99
Architecture: any
10-
Depends: libc6, libsdl2-2.0-0, libopenal1, libcrypto++6, liblockfile1, libfreeimage3, libfreeimageplus3, liblua5.1-0, libogg0, libtheora0, libvorbis0a, liblzo2-2, libjpeg-turbo8, libglew2.0
10+
Depends: libc6, libsdl2-2.0-0, libopenal1, libcrypto++6, libfreeimage3, libfreeimageplus3, liblua5.1-0, libogg0, libtheora0, libvorbis0a, liblzo2-2, libjpeg-turbo8, libglew2.0
1111
Description: X-Ray Engine 1.6 expansion
1212
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.

‎docker/image/install_deps.sh

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ apt-get install -y \
3333
libglew-dev \
3434
libfreeimage-dev \
3535
libfreeimageplus-dev \
36-
liblockfile-dev \
3736
libopenal-dev \
3837
libcrypto++-dev \
3938
libogg-dev \

‎src/xrEngine/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ target_include_directories(${PROJECT_NAME}
180180
${SDL_INCLUDE_DIRS}
181181
${FREEIMAGE_INCLUDE_PATH}
182182
${FREEIMAGEPLUS_INCLUDE_PATH}
183-
${LOCKFILE_INCLUDE_DIR}
184183
)
185184

186185
target_link_libraries(${PROJECT_NAME}
@@ -200,7 +199,6 @@ target_link_libraries(${PROJECT_NAME}
200199
${OGG_LIBRARIES}
201200
xrCDB
202201
openal
203-
${LOCKFILE_LIBRARIES}
204202
${SDL_LIBRARIES}
205203
)
206204

‎src/xrEngine/main.cpp

-23
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
#if defined(XR_PLATFORM_WINDOWS)
66
#include <process.h>
7-
#elif defined(XR_PLATFORM_LINUX)
8-
#include <lockfile.h>
97
#endif
108
#include <locale.h>
119

@@ -31,10 +29,6 @@
3129

3230
#include "xrCore/Threading/TaskManager.hpp"
3331

34-
#ifdef MASTER_GOLD
35-
#define NO_MULTI_INSTANCES
36-
#endif
37-
3832
// global variables
3933
ENGINE_API CInifile* pGameIni = nullptr;
4034
ENGINE_API bool g_bBenchmark = false;
@@ -209,9 +203,6 @@ ENGINE_API void destroyEngine()
209203
{
210204
Device.Destroy();
211205
Engine.Destroy();
212-
#if defined(XR_PLATFORM_LINUX)
213-
lockfile_remove("/var/lock/stalker-cop.lock");
214-
#endif
215206
}
216207

217208
void execUserScript()
@@ -346,20 +337,6 @@ ENGINE_API int RunApplication()
346337
{
347338
R_ASSERT2(Core.Params, "Core must be initialized");
348339

349-
#ifdef NO_MULTI_INSTANCES
350-
if (!GEnv.isDedicatedServer)
351-
{
352-
#if defined(XR_PLATFORM_WINDOWS)
353-
CreateMutex(nullptr, true, "Local\\STALKER-COP");
354-
if (GetLastError() == ERROR_ALREADY_EXISTS)
355-
return 2;
356-
#elif defined(XR_PLATFORM_LINUX)
357-
int lock_res = lockfile_create("/var/lock/stalker-cop.lock", 0, L_PID);
358-
if(L_ERROR == lock_res)
359-
return 2;
360-
#endif
361-
}
362-
#endif
363340
*g_sLaunchOnExit_app = 0;
364341
*g_sLaunchOnExit_params = 0;
365342

1 commit comments

Comments
 (1)

Xottab-DUTY commented on Dec 17, 2021

@Xottab-DUTY
MemberAuthor

This commit deletes liblockfile.

Please sign in to comment.