mirror of
https://github.com/fallout2-ce/fallout2-ce.git
synced 2026-07-27 16:47:11 -07:00
Compare commits
8
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2759d28997 | ||
|
|
cbc40e2df7 | ||
|
|
41c3fa2b8c | ||
|
|
4a6dc44419 | ||
|
|
9a4108f44d | ||
|
|
0ef73e73da | ||
|
|
9e5660d9fe | ||
|
|
620505bec3 |
@@ -30,7 +30,13 @@ jobs:
|
||||
git config --global --add safe.directory "*"
|
||||
mkdir -p build
|
||||
cd build
|
||||
emcmake cmake ../ -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain/Emscripten.cmake -DCMAKE_BUILD_TYPE=Release && emmake make VERBOSE=1 -j 4
|
||||
if [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
|
||||
export BUILD_TYPE=Debug
|
||||
else
|
||||
export BUILD_TYPE=Release
|
||||
fi
|
||||
emcmake cmake ../ -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain/Emscripten.cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
|
||||
emmake make VERBOSE=1 -j 4
|
||||
cd ..
|
||||
|
||||
- name: Add node
|
||||
|
||||
@@ -172,6 +172,9 @@ int gameInitWithOptions(const char* windowTitle, bool isMapper, int font, int a4
|
||||
showSplash();
|
||||
}
|
||||
|
||||
#if (defined(__EMSCRIPTEN__) && !defined(NDEBUG))
|
||||
debugPrint("This is a web build with debug mode so print to the console\n");
|
||||
#else
|
||||
// CE: Handle debug mode (exactly as seen in `mapper2.exe`).
|
||||
const char* debugMode = settings.debug.mode.c_str();
|
||||
if (compat_stricmp(debugMode, "environment") == 0) {
|
||||
@@ -185,6 +188,7 @@ int gameInitWithOptions(const char* windowTitle, bool isMapper, int font, int a4
|
||||
} else if (compat_stricmp(debugMode, "gnw") == 0) {
|
||||
_debug_register_func(_win_debug);
|
||||
}
|
||||
#endif
|
||||
|
||||
interfaceFontsInit();
|
||||
fontManagerAdd(&gModernFontManager);
|
||||
|
||||
Vendored
+2
-2
@@ -1,8 +1,8 @@
|
||||
include(FetchContent)
|
||||
|
||||
FetchContent_Declare(fpattern
|
||||
GIT_REPOSITORY "https://github.com/alexbatalov/fpattern"
|
||||
GIT_TAG 8523173ec252c3b796fcdfca0fcc6329642fbbe3 # v1.9
|
||||
GIT_REPOSITORY "https://github.com/fallout2-ce/fpattern"
|
||||
GIT_TAG 35005aec7dd94584a7563fb75bc0597b2259058d # v1.9
|
||||
GIT_SHALLOW TRUE
|
||||
GIT_PROGRESS TRUE
|
||||
EXCLUDE_FROM_ALL
|
||||
|
||||
Reference in New Issue
Block a user