Skip to content

Commit 9830abb

Browse files
committed
fix build errors
latest version of libunwind fails to build due to error in src code includes cg_unlagged.c Update rtcwpro-compile-18 fix to build on ubuntu 18
1 parent c651c24 commit 9830abb

File tree

6 files changed

+43
-7
lines changed

6 files changed

+43
-7
lines changed

docker-scripts/dockerfiles/rtcwpro-compile-18

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,18 @@ RUN dpkg --add-architecture i386 && \
1313
apt-get install -y wget libc6:i386 zip \
1414
unzip git gdb-multiarch gcc cmake perl curl gcc-multilib g++-multilib \
1515
autoconf libtool nasm mingw-w64 mingw-w64-tools g++ \
16-
libgl-dev libsdl2-dev:i386 clang-tools-10 lld-10
16+
libgl-dev libsdl2-dev:i386 lsb-release software-properties-common gnupg
1717

18-
RUN ln -s /usr/bin/clang-10 /usr/bin/clang && \
19-
ln -s /usr/bin/clang-cl-10 /usr/bin/clang-cl && \
20-
ln -s /usr/bin/llvm-lib-10 /usr/bin/llvm-lib && \
21-
ln -s /usr/bin/lld-link-10 /usr/bin/lld-link && \
22-
ln -s /usr/bin/llvm-rc-10 /usr/bin/llvm-rc
18+
RUN wget -qO- https://apt.llvm.org/llvm.sh | bash -s -- 15
19+
20+
RUN apt-get update && \
21+
apt-get install -y clang-tools-15 lld-15
22+
23+
RUN ln -s /usr/bin/clang-15 /usr/bin/clang && \
24+
ln -s /usr/bin/clang-cl-15 /usr/bin/clang-cl && \
25+
ln -s /usr/bin/llvm-lib-15 /usr/bin/llvm-lib && \
26+
ln -s /usr/bin/lld-link-15 /usr/bin/lld-link && \
27+
ln -s /usr/bin/llvm-rc-15 /usr/bin/llvm-rc
2328

2429
RUN mkdir /output
2530
RUN chown compile:compile /output

fetch-dependencies.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ cd $DEPS_ROOT
9595

9696
LIBUNWIND_DIR=`pwd`/libunwind
9797
if [ ! -d "$LIBUNWIND_DIR" ]; then
98-
VER=$(curl --silent -qI https://github.com/libunwind/libunwind/releases/latest | awk -F '/' '/^location/ {print substr($NF, 1, length($NF)-1)}');
98+
#VER=$(curl --silent -qI https://github.com/libunwind/libunwind/releases/latest | awk -F '/' '/^location/ {print substr($NF, 1, length($NF)-1)}');
99+
VER="v1.8.1"
99100
wget https://api.github.com/repos/libunwind/libunwind/tarball/$VER
100101
tar xvfz $VER
101102
rm $VER

src/cgame/cgame.vcproj

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -782,6 +782,27 @@
782782
/>
783783
</FileConfiguration>
784784
</File>
785+
<File
786+
RelativePath="cg_unlagged.c"
787+
>
788+
<FileConfiguration
789+
Name="Debug|Win32"
790+
>
791+
<Tool
792+
Name="VCCLCompilerTool"
793+
Optimization="0"
794+
BrowseInformation="0"
795+
/>
796+
</FileConfiguration>
797+
<FileConfiguration
798+
Name="Release|Win32"
799+
>
800+
<Tool
801+
Name="VCCLCompilerTool"
802+
Optimization="2"
803+
/>
804+
</FileConfiguration>
805+
</File>
785806
<File
786807
RelativePath="cg_view.c"
787808
>

src/cgame/cgame.vcxproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,11 @@ powershell cp """$(SolutionDir)Builds\$(Configuration)\$(ProjectName)\$(TargetNa
317317
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</BrowseInformation>
318318
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
319319
</ClCompile>
320+
<ClCompile Include="cg_unlagged.c">
321+
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
322+
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</BrowseInformation>
323+
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
324+
</ClCompile>
320325
<ClCompile Include="cg_view.c">
321326
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
322327
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</BrowseInformation>

src/cgame/cgame.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,9 @@
8282
<ClCompile Include="cg_trails.c">
8383
<Filter>Source Files</Filter>
8484
</ClCompile>
85+
<ClCompile Include="cg_unlagged.c">
86+
<Filter>Source Files</Filter>
87+
</ClCompile>
8588
<ClCompile Include="cg_view.c">
8689
<Filter>Source Files</Filter>
8790
</ClCompile>

src/unix/Conscript-cgame

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ $CG_FILESREF = \@CG_FILES_OUT;
6161
../cgame/cg_spawn.c
6262
../cgame/cg_syscalls.c
6363
../cgame/cg_trails.c
64+
../cgame/cg_unlagged.c
6465
../cgame/cg_view.c
6566
../cgame/cg_weapons.c
6667
);

0 commit comments

Comments
 (0)