mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-28 15:29:55 +02:00
Code Issues Releases Wiki Activity

#15 fix web and linux build

Browse Source
This commit is contained in:
XProger
2018-02-05 02:30:24 +03:00
parent 3fdc211f99
commit ef4219911a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gameflow.h
View File

@@ -457,8 +457,8 @@ namespace TR {
case VER_TR2 : return LVL_TR2_ASSAULT; case VER_TR2 : return LVL_TR2_ASSAULT;
case VER_TR3 : return LVL_TR3_HOUSE; case VER_TR3 : return LVL_TR3_HOUSE;
} }
return LVL_TR1_TITLE;
ASSERT(false); ASSERT(false);
return LVL_MAX;
} }
LevelID getStartId(Version version) { LevelID getStartId(Version version) {
@@ -467,8 +467,8 @@ namespace TR {
case VER_TR2 : return LVL_TR2_WALL; case VER_TR2 : return LVL_TR2_WALL;
case VER_TR3 : return LVL_TR3_JUNGLE; case VER_TR3 : return LVL_TR3_JUNGLE;
} }
return LVL_MAX;
ASSERT(false); ASSERT(false);
return LVL_MAX;
} }
LevelID getEndId(Version version) { LevelID getEndId(Version version) {
@@ -477,8 +477,8 @@ namespace TR {
case VER_TR2 : return LVL_TR2_HOUSE; case VER_TR2 : return LVL_TR2_HOUSE;
case VER_TR3 : return LVL_TR3_CHAMBER; case VER_TR3 : return LVL_TR3_CHAMBER;
} }
return LVL_MAX;
ASSERT(false); ASSERT(false);
return LVL_MAX;
} }
bool isCutsceneLevel(LevelID id) { bool isCutsceneLevel(LevelID id) {
@@ -546,7 +546,7 @@ namespace TR {
} }
} else { } else {
strcpy(dst, "level/"); strcpy(dst, "level/");
if (version & VER_TR1) strcat(dst, "1/"); if ((version & VER_TR1) || version == VER_UNKNOWN) strcat(dst, "1/");
if (version & VER_TR2) strcat(dst, "2/"); if (version & VER_TR2) strcat(dst, "2/");
if (version & VER_TR3) strcat(dst, "3/"); if (version & VER_TR3) strcat(dst, "3/");
strcat(dst, LEVEL_INFO[id].name); strcat(dst, LEVEL_INFO[id].name);

2
src/platform/nix/build.sh
View File

@@ -1,3 +1,3 @@
set -e set -e
clang++ -std=c++11 -Os -s -fno-exceptions -fno-rtti -ffunction-sections -fdata-sections -Wl,--gc-sections -DNDEBUG main.cpp ../../libs/stb_vorbis/stb_vorbis.c ../../libs/minimp3/minimp3.cpp ../../libs/tinf/tinflate.c -I../../ -o../../../bin/OpenLara -lX11 -lGL -lm -lpthread -lpulse-simple -lpulse clang++ -std=c++11 -Os -s -fno-exceptions -fno-rtti -ffunction-sections -fdata-sections -Wl,--gc-sections -DNDEBUG -D_POSIX_THREADS -D_POSIX_READER_WRITER_LOCKS main.cpp ../../libs/stb_vorbis/stb_vorbis.c ../../libs/minimp3/minimp3.cpp ../../libs/tinf/tinflate.c -I../../ -o../../../bin/OpenLara -lX11 -lGL -lm -lpthread -lpulse-simple -lpulse
strip ../../../bin/OpenLara --strip-all --remove-section=.comment --remove-section=.note strip ../../../bin/OpenLara --strip-all --remove-section=.comment --remove-section=.note