Flux (#12)

* Add FLUX.2 image generation support and texture reload functionality

- Introduced a new CMake option `USE_FLUX` to enable FLUX.2 image generation.
- Updated `CMakeLists.txt` to conditionally include the cflux2 library based on the new option.
- Added FLUX-related cvars and commands in `cl_main.c` for image generation control.
- Implemented `R_ReloadTexture` function in both OpenGL and Vulkan renderers to reload textures from disk.
- Enhanced documentation in `README.md` to include details about FLUX.2 image generation features and usage.
- Updated renderer initialization to support texture reload functionality across both OpenGL and Vulkan backends.

* Update README.md and cl_main.c for FLUX model variant support

- Enhanced README.md to clarify FLUX.2 and FLUX.1 image generation options, including support for different model variants.
- Modified cl_main.c to implement separate directories for FLUX model variants, improving organization and clarity in model path handling.
- Updated default FLUX model variant to "flux1-schnell" for better user experience.

* Add file existence check and improve FLUX model path handling

- Introduced a helper function `CL_FluxFileExists` to verify the existence of model files, enhancing error handling for model loading.
- Updated the logic in `CL_FluxGetModelPath` to check for the presence of the "flux2-dev" directory before falling back to the default "flux" directory, improving user experience and clarity.
- Enhanced asynchronous job initialization in `CL_FluxGenerate_f` to ensure all parameters are set before marking the job as running, preventing potential race conditions.
- Added warnings for missing FLUX.1 model files, guiding users to download them manually or switch to FLUX.2 if necessary.

* Add external FLUX CLI support and enhance error handling

- Implemented logic in `compile_engine.sh` to copy the `flux_cli` executable from the build directory to the release directory, improving deployment ease.
- Introduced new cvars in `cl_main.c` for external FLUX generation, allowing users to choose between in-process and external CLI execution, enhancing stability.
- Added helper functions for shell argument escaping and CLI path finding, improving command execution reliability.
- Enhanced error handling in the FLUX generation process to provide clearer feedback on failures, improving user experience.

* Add cflux2 source management to build workflow

- Introduced a new step in the GitHub Actions workflow to ensure the cflux2 sources are available by cloning the repository if the directory does not exist.
- This addition enhances the build process by automating the retrieval of necessary external dependencies, improving build reliability and consistency.

* Remove cflux2 source management steps from build workflow

- Eliminated redundant steps in the GitHub Actions workflow that ensured the availability of cflux2 sources by cloning the repository. This streamlines the build process and reduces unnecessary checks, as the sources are now assumed to be managed externally.

* Add cflux2 subproject as a Git submodule

- Introduced cflux2 as a new subproject, allowing for better management of external dependencies within the build system. This addition enhances the overall structure and maintainability of the project.

* Refactor GitHub Actions workflow to remove submodule checkout steps

- Eliminated redundant `submodules: recursive` options from the `actions/checkout@v4` steps in the build workflow. This streamlines the workflow by assuming that submodules are managed externally, improving build efficiency.

* add cflux2 sources

Co-authored-by: Cursor <cursoragent@cursor.com>

* skip flux build on Windows

Co-authored-by: Cursor <cursoragent@cursor.com>

* Add SDL2 include and library paths to build workflow

- Updated the GitHub Actions build workflow to include SDL2 include and library paths, enhancing the configuration for projects that depend on SDL2. This change improves build accuracy and ensures that the necessary SDL2 resources are correctly referenced during the build process.

* Implement platform-specific memory mapping and file handling in safetensors

- Added Windows-specific file handling and memory mapping functions in `flux_safetensors.c` to support proper file operations on Windows systems.
- Introduced a new `safetensors_get_file_size` function for improved file size retrieval.
- Updated `safetensors_open` to handle file opening and memory mapping differently based on the platform, enhancing cross-platform compatibility.
- Modified `safetensors_file_t` structure to include handles for Windows-specific file management.

* Refactor cflux2 build conditions in CMakeLists.txt

- Updated the CMake configuration to always include the cflux2 subdirectory when USE_FLUX is enabled, removing the previous Windows-specific skip condition.
- Adjusted the linking of the cflux2 library to ensure it is only linked if the target exists, improving build robustness.

* Update CMakeLists.txt to use PRIVATE linkage for libraries

- Changed the linking of libraries in the CMake configuration to use PRIVATE visibility for qcommon, botlib, client, q3ui, OpenAL, and Vulkan/OpenGL. This improves encapsulation and ensures that these dependencies are not exposed to other targets, enhancing build integrity.

* Update CMakeLists.txt to enforce PRIVATE linkage for additional libraries

- Modified the CMake configuration to apply PRIVATE visibility for libraries linked to both the dedicated server and client executables, including qcommon, botlib, winmm, comctl32, ws2_32, and m. This change enhances encapsulation and ensures that these dependencies are not exposed to other targets, improving build integrity.

* Refactor memory mapping and cleanup in safetensors

- Renamed the memory mapping function to `safetensors_mmap_fd` for clarity and updated the handling of file size to use a 64-bit integer for compatibility.
- Introduced a new `safetensors_unmap` function to centralize unmapping and resource cleanup, improving code maintainability.
- Updated `safetensors_open` and `safetensors_close` to utilize the new unmap function, ensuring proper resource management across platforms.

* Enhance build configuration and code quality

- Updated the GitHub Actions build workflow to include the `-DCI_BUILD=OFF` flag for all CMake build commands, ensuring consistent behavior across different build types.
- Improved type safety in Vulkan renderer by casting size comparisons to `size_t` in `vk_vbo.c`, preventing potential overflow issues.
- Added clang diagnostic pragmas in `vm_aarch64.c` to suppress specific warnings, enhancing code clarity and maintainability.
- Refined conditional checks in `tr_world.c` to ensure proper type comparison for node contents, improving code robustness.

* Enhance CMake configuration and error handling

- Added SDL2::Core linkage and include directories for the client target in CMake, improving dependency management.
- Updated error messages in `flux.c` to limit the length of file paths displayed, enhancing clarity and preventing potential overflow issues.
- Improved file handling in `terminals.c` for Windows compatibility by conditionally using `mkstemp`, ensuring consistent behavior across platforms.
- Refactored type handling in `tr_surface.c`, `tr_vbo.c`, and `tr_world.c` to improve code safety and maintainability by using appropriate type casts and const qualifiers.

* Refactor CMake configuration and client code for SDL2 compatibility

- Enhanced CMakeLists.txt to conditionally include SDL2 directories based on availability, improving flexibility in build configurations.
- Added a static variable in cl_curl.c to prevent unused variable warnings when CURL is not used.
- Initialized jpeg_decompress_struct in cl_jpeg.c to zero for better safety.
- Updated cl_main.c to handle SDL thread management conditionally, ensuring proper cleanup and error handling in flux operations.

* Refactor error handling and code quality improvements

- Updated error messages in `flux.c` to shorten file path displays, enhancing clarity and preventing overflow issues.
- Changed static variable declaration to an enum in `cl_curl.c` for better type safety when CURL is not used.
- Added MSVC-specific pragmas in `psy.c` and `vorbisfile.c` to suppress warnings, improving code maintainability.
- Marked several functions in `vm_x86.c` as unused to prevent compiler warnings, enhancing code cleanliness.

* Enhance flux generation and CMake configuration

- Added conditional compilation for SDL support in `cl_main.c`, improving thread management for flux generation.
- Updated parameter logging in `CL_FluxGenerationThread` to use `long long` for seed values, enhancing precision.
- Modified CMakeLists.txt to improve shader header generation command and suppress specific compiler warnings for better compatibility across compilers.
- Added unused parameter suppression in JPEG handling files to clean up warnings and improve code quality.

* Add unused parameter suppression in JPEG and OGG codec files

* Refactor OGG codec and enhance flux CLI build configuration

- Changed the static variable declaration in `snd_codec_ogg.c` to an enum for better type safety.
- Updated `CMakeLists.txt` for `flux_cli` to conditionally include `linenoise.c` based on the platform, improving compatibility.
- Added custom `linenoise` implementation in `flux_cli.c` when `FLUX_CLI_NO_LINENOISE` is defined, enhancing flexibility in command line input handling.
- Improved type safety in `win_syscon.c` by casting buffer lengths to `size_t`, preventing potential overflow issues.

---------

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: timfox

.github/workflows/build.yml

@@ -55,8 +55,6 @@ jobs:
         cache: false
 
     - uses: actions/checkout@v4
-      with:
-        submodules: recursive
 
     - name: Build Vulkan
       if: ${{ github.event_name != 'release' || matrix.btype != 'Debug' }} # skip Debug configuration in Release build
@@ -66,6 +64,7 @@ jobs:
         mkdir -p build-vk-${{ matrix.btype }}
         cmake -S . -B build-vk-${{ matrix.btype }} -G Ninja \
           -DCMAKE_BUILD_TYPE=${{ matrix.btype }} \
+          -DCI_BUILD=OFF \
           -DUSE_STB_TRUETYPE=ON \
           -DBUILD_FREETYPE=ON \
           -DENABLE_FORTIFY_SOURCE=OFF \
@@ -87,6 +86,7 @@ jobs:
         mkdir -p build-gl-${{ matrix.btype }}
         cmake -S . -B build-gl-${{ matrix.btype }} -G Ninja \
           -DCMAKE_BUILD_TYPE=${{ matrix.btype }} \
+          -DCI_BUILD=OFF \
           -DUSE_STB_TRUETYPE=ON \
           -DBUILD_FREETYPE=ON \
           -DENABLE_FORTIFY_SOURCE=OFF \
@@ -137,8 +137,6 @@ jobs:
     - uses: microsoft/setup-msbuild@v2
 
     - uses: actions/checkout@v4
-      with:
-        submodules: recursive
 
     - name: Build
       if: ${{ github.event_name != 'release' || matrix.btype != 'Debug' }} # skip Debug configuration in Release build
@@ -201,8 +199,6 @@ jobs:
         fi
 
     - uses: actions/checkout@v4
-      with:
-        submodules: recursive
 
     - name: Build Vulkan
       if: ${{ github.event_name != 'release' || matrix.btype != 'Debug' }} # skip in Release builds
@@ -213,6 +209,7 @@ jobs:
         mkdir -p build-vk-${{ matrix.btype }}
         cmake -S . -B build-vk-${{ matrix.btype }} \
           -DCMAKE_BUILD_TYPE=${{ matrix.btype }} \
+          -DCI_BUILD=OFF \
           -DUSE_STB_TRUETYPE=ON \
           -DBUILD_FREETYPE=ON \
           -DBUILD_FREETYPE=ON \
@@ -236,6 +233,7 @@ jobs:
         mkdir -p build-gl-${{ matrix.btype }}
         cmake -S . -B build-gl-${{ matrix.btype }} \
           -DCMAKE_BUILD_TYPE=${{ matrix.btype }} \
+          -DCI_BUILD=OFF \
           -DUSE_STB_TRUETYPE=ON \
           -DBUILD_FREETYPE=ON \
           -DBUILD_FREETYPE=ON \
@@ -277,8 +275,6 @@ jobs:
 
     - uses: actions/checkout@v4
       if: false
-      with:
-        submodules: recursive
 
     - name: Build ${{ matrix.arch }}
       #if: ${{ github.event_name != 'release' || matrix.btype != 'Debug' }} # skip Debug configuration in Release build
@@ -328,8 +324,6 @@ jobs:
         sudo apt-get -y install libcurl4-openssl-dev mesa-common-dev libxxf86dga-dev libxrandr-dev libxxf86vm-dev libasound-dev libsdl2-dev libopenal-dev libfreetype6-dev
 
     - uses: actions/checkout@v4
-      with:
-        submodules: recursive
 
     - name: Build Vulkan
       if: ${{ github.event_name != 'release' || matrix.btype != 'Debug' }} # skip Debug configuration in Release build
@@ -339,6 +333,7 @@ jobs:
         mkdir -p build-vk-${{ matrix.btype }}
         cmake -S . -B build-vk-${{ matrix.btype }} \
           -DCMAKE_BUILD_TYPE=${{ matrix.btype }} \
+          -DCI_BUILD=OFF \
           -DUSE_STB_TRUETYPE=ON \
           -DENABLE_FORTIFY_SOURCE=OFF \
           -DENABLE_ASAN=OFF \
@@ -359,6 +354,7 @@ jobs:
         mkdir -p build-gl-${{ matrix.btype }}
         cmake -S . -B build-gl-${{ matrix.btype }} \
           -DCMAKE_BUILD_TYPE=${{ matrix.btype }} \
+          -DCI_BUILD=OFF \
           -DUSE_STB_TRUETYPE=ON \
           -DENABLE_FORTIFY_SOURCE=OFF \
           -DENABLE_ASAN=OFF \
@@ -396,8 +392,6 @@ jobs:
       run: brew install coreutils sdl2 openal-soft cmake ninja freetype
 
     - uses: actions/checkout@v4
-      with:
-        submodules: recursive
 
     - name: Build Vulkan
       if: ${{ github.event_name != 'release' || matrix.btype != 'Debug' }} # skip Debug configuration in Release build
@@ -410,8 +404,11 @@ jobs:
         mkdir -p build-vk-${{ matrix.btype }}
         cmake -S . -B build-vk-${{ matrix.btype }} \
           -DCMAKE_BUILD_TYPE=${{ matrix.btype }} \
+          -DCI_BUILD=OFF \
           -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }} \
           -DSDL2_PATH="${SDL2_PREFIX}" \
+          -DSDL2_INCLUDE_DIR="${SDL2_PREFIX}/include" \
+          -DSDL2_LIBRARY="${SDL2_PREFIX}/lib/libSDL2.dylib" \
           -DOPENAL_INCLUDE_DIR="${OPENAL_PREFIX}/include" \
           -DOPENAL_LIBRARY="${OPENAL_PREFIX}/lib/libopenal.dylib" \
           -DUSE_STB_TRUETYPE=ON \
@@ -440,8 +437,11 @@ jobs:
         mkdir -p build-gl-${{ matrix.btype }}
         cmake -S . -B build-gl-${{ matrix.btype }} \
           -DCMAKE_BUILD_TYPE=${{ matrix.btype }} \
+          -DCI_BUILD=OFF \
           -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }} \
           -DSDL2_PATH="${SDL2_PREFIX}" \
+          -DSDL2_INCLUDE_DIR="${SDL2_PREFIX}/include" \
+          -DSDL2_LIBRARY="${SDL2_PREFIX}/lib/libSDL2.dylib" \
           -DOPENAL_INCLUDE_DIR="${OPENAL_PREFIX}/include" \
           -DOPENAL_LIBRARY="${OPENAL_PREFIX}/lib/libopenal.dylib" \
           -DUSE_STB_TRUETYPE=ON \

CMakeLists.txt

@@ -8,6 +8,7 @@ set(CMAKE_C_EXTENSIONS OFF)
 
 option(C_STANDARD_STRICT "Enable the stricter warning set for engine builds" ON)
 option(CI_BUILD "Enable CI-specific behaviors such as warnings-as-errors" OFF)
+option(USE_FLUX "Enable FLUX.2 image generation support" ON)
 
 if(C_STANDARD_STRICT)
   if(MSVC)
@@ -175,7 +176,7 @@ OPTION(USE_MP3 "Enable MP3 codec support" ON)
 OPTION(USE_SYSTEM_JPEG "" OFF)
 OPTION(USE_RENDERER_DLOPEN "" ON)
 OPTION(SKIP_IDPAK_CHECK "Skip checking for original Quake III pak files (pak0.pk3)" ON)
-OPTION(BUILD_FREETYPE "Enable FreeType-powered font rendering / font generation" OFF)
+OPTION(BUILD_FREETYPE "Enable FreeType-powered font rendering / font generation" ON)
 
 SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules)
 
@@ -186,6 +187,11 @@ set(EXTERNAL_SDL_INCLUDE_DIR "${EXTERNAL_SRC}/sdl/include/SDL2")
 set(EXTERNAL_CURL_WINDOWS_INCLUDE_DIR "${EXTERNAL_SRC}/curl/windows/include")
 set(EXTERNAL_JPEG_SRC_DIR "${EXTERNAL_SRC}/jpeg")
 
+# Add cflux2 external library
+if(USE_FLUX)
+	add_subdirectory(src/external/src/cflux2)
+endif()
+
 if(BUILD_FREETYPE)
   find_package(Freetype REQUIRED)
   add_library(idtech3_freetype INTERFACE)
@@ -307,22 +313,39 @@ IF(USE_SYSTEM_JPEG)
 	ADD_LIBRARY(client OBJECT ${CLIENT_SRCS})
 	find_package(JPEG REQUIRED)
 	TARGET_COMPILE_DEFINITIONS(client PRIVATE -DUSE_SYSTEM_JPEG)
+	if(USE_FLUX)
+		TARGET_COMPILE_DEFINITIONS(client PRIVATE USE_FLUX)
+		target_include_directories(client PRIVATE ${EXTERNAL_ROOT}/src/cflux2)
+	endif()
 	TARGET_LINK_LIBRARIES(client ${JPEG_LIBRARIES})
 ELSE()
 	AUX_SOURCE_DIRECTORY(${EXTERNAL_JPEG_SRC_DIR} JPEG_SRCS)
 	#ADD_LIBRARY(jpeg ${JPEG_SRCS})
 	#TARGET_LINK_LIBRARIES(client jpeg)
 	ADD_LIBRARY(client OBJECT ${CLIENT_SRCS} ${JPEG_SRCS})
+	if(USE_FLUX)
+		TARGET_COMPILE_DEFINITIONS(client PRIVATE USE_FLUX)
+		target_include_directories(client PRIVATE ${EXTERNAL_ROOT}/src/cflux2)
+	endif()
 	# Ensure client can find qcommon headers needed by some client-side modules (eg. mp3)
 	target_include_directories(client PRIVATE ${CMAKE_SOURCE_DIR}/src/qcommon ${EXTERNAL_JPEG_SRC_DIR})
 ENDIF()
 
 # renderers
-AUX_SOURCE_DIRECTORY(src/renderers/rendercommon RENDERER_COMMON_SRCS)
+set(RENDERER_COMMON_SRCS
+	src/renderers/rendercommon/tr_font_stub.c  # placeholder, will be replaced below
+	src/renderers/rendercommon/tr_image_bmp.c
+	src/renderers/rendercommon/tr_image_jpg.c
+	src/renderers/rendercommon/tr_image_pcx.c
+	src/renderers/rendercommon/tr_image_png.c
+	src/renderers/rendercommon/tr_image_tga.c
+	src/renderers/rendercommon/tr_noise.c
+)
 IF(BUILD_FREETYPE)
+	list(REMOVE_ITEM RENDERER_COMMON_SRCS src/renderers/rendercommon/tr_font_stub.c)
 	list(APPEND RENDERER_COMMON_SRCS src/renderers/rendercommon/tr_font.c)
 ELSE()
-	list(APPEND RENDERER_COMMON_SRCS src/renderers/rendercommon/tr_font_stub.c)
+	# Keep tr_font_stub.c
 ENDIF()
 AUX_SOURCE_DIRECTORY(src/renderers/openglrenderer RENDERER_GL_SRCS)
 AUX_SOURCE_DIRECTORY(src/renderers/vulkanrenderer RENDERER_VK_SRCS)
@@ -466,6 +489,12 @@ IF(NOT MSVC)
 		  message(FATAL_ERROR "SDL2 could not be found. Please install or set SDL2_DIR/SDL2_PATH.")
 		endif()
 		TARGET_LINK_LIBRARIES(q3ui SDL2::Main)
+		TARGET_LINK_LIBRARIES(client PRIVATE SDL2::Core)
+		if(SDL2_INCLUDE_DIRS)
+			target_include_directories(client PRIVATE ${SDL2_INCLUDE_DIRS})
+		elseif(SDL2_INCLUDE_DIR)
+			target_include_directories(client PRIVATE ${SDL2_INCLUDE_DIR})
+		endif()
 	ELSEIF(UNIX)
 		find_package (X11 REQUIRED)
 		TARGET_LINK_LIBRARIES(q3ui ${X11_LIBRARIES})
@@ -505,10 +534,16 @@ endif()
 # client executable
 
 ADD_EXECUTABLE(${CNAME}${BINEXT} ${EXE_TYPE} ${Q3_SRCS})
-TARGET_LINK_LIBRARIES(${CNAME}${BINEXT} qcommon botlib client q3ui)
+TARGET_LINK_LIBRARIES(${CNAME}${BINEXT} PRIVATE qcommon botlib client q3ui)
+if(USE_FLUX)
+	TARGET_COMPILE_DEFINITIONS(${CNAME}${BINEXT} PRIVATE USE_FLUX)
+	if(TARGET cflux2)
+		TARGET_LINK_LIBRARIES(${CNAME}${BINEXT} PRIVATE cflux2)
+	endif()
+endif()
 # Link OpenAL only when enabled
 IF(USE_OPENAL)
-	TARGET_LINK_LIBRARIES(${CNAME}${BINEXT} OpenAL::OpenAL)
+	TARGET_LINK_LIBRARIES(${CNAME}${BINEXT} PRIVATE OpenAL::OpenAL)
 ENDIF()
 #TARGET_LINK_OPTIONS(${CNAME} PRIVATE -fno-pie) # v3.13+
 
@@ -520,26 +555,26 @@ endif()
 
 IF(NOT USE_RENDERER_DLOPEN)
 	IF(USE_VULKAN)
-		TARGET_LINK_LIBRARIES(${CNAME}${BINEXT} ${RENDERER_PREFIX}_vulkan)
+		TARGET_LINK_LIBRARIES(${CNAME}${BINEXT} PRIVATE ${RENDERER_PREFIX}_vulkan)
 	ELSE()
-		TARGET_LINK_LIBRARIES(${CNAME}${BINEXT} ${RENDERER_PREFIX}_opengl)
+		TARGET_LINK_LIBRARIES(${CNAME}${BINEXT} PRIVATE ${RENDERER_PREFIX}_opengl)
 	ENDIF()
 ENDIF()
 
 # dedicated server executable
 
 ADD_EXECUTABLE(${DNAME}${BINEXT} ${EXE_TYPE} ${Q3_SRCS})
-TARGET_LINK_LIBRARIES(${DNAME}${BINEXT} qcommon_ded botlib)
+TARGET_LINK_LIBRARIES(${DNAME}${BINEXT} PRIVATE qcommon_ded botlib)
 #TARGET_LINK_OPTIONS(${DNAME} PRIVATE -fno-pie) # v3.13+
 
 if(UNIX AND NOT MSVC AND NOT APPLE)
   target_link_options(${DNAME}${BINEXT} PRIVATE "-Wl,--export-dynamic")
 endif()
 
 IF(WIN32)
-	TARGET_LINK_LIBRARIES(${CNAME}${BINEXT} winmm comctl32 ws2_32)
-	TARGET_LINK_LIBRARIES(${DNAME}${BINEXT} winmm comctl32 ws2_32)
+	TARGET_LINK_LIBRARIES(${CNAME}${BINEXT} PRIVATE winmm comctl32 ws2_32)
+	TARGET_LINK_LIBRARIES(${DNAME}${BINEXT} PRIVATE winmm comctl32 ws2_32)
 ELSE()
-	TARGET_LINK_LIBRARIES(${CNAME}${BINEXT} m ${CMAKE_DL_LIBS})
-	TARGET_LINK_LIBRARIES(${DNAME}${BINEXT} m ${CMAKE_DL_LIBS})
+	TARGET_LINK_LIBRARIES(${CNAME}${BINEXT} PRIVATE m ${CMAKE_DL_LIBS})
+	TARGET_LINK_LIBRARIES(${DNAME}${BINEXT} PRIVATE m ${CMAKE_DL_LIBS})
 ENDIF()

README.md

@@ -13,22 +13,22 @@ Go to [Releases](../../releases) section to download latest binaries for your pl
 **Rendering**:
 * OpenGL renderer
 * Vulkan renderer
-* Physical Based Rendering
+* Physically Based Rendering
+
+**Image Generation**:
+* FLUX.2/FLUX.1 C image generation (optional, text-to-image from console with **real-time hot-reloading** and device selection; supports flux1-schnell/fast, flux1-dev/balanced, flux2-dev/high-quality variants; requires model files in game directory; Metal, BLAS, or pure C backend, with graceful fallback)
 
 **Audio**:
-* OpenAL backend with HRTF for true 3D positional audio.
-* Heuristic acoustics: real-time reverb/occlusion using OpenAL EFX.
+* OpenAL backend with HRTF for 3D positional audio
+* Heuristic acoustics: real-time reverb/occlusion using OpenAL EFX
 
 ### Standards
 
 - Engine code targets **C23**, with incremental modernization for safety and portability.
 - Engine-internal code prefers native C `bool`; legacy `qboolean` is retained where required for compatibility.
 
+
 ### Links
 
 * https://idtech3.com
-* https://bitbucket.org/CPMADevs/cnq3
-* https://github.com/ioquake/ioq3
-* https://github.com/kennyalive/Quake-III-Arena-Kenny-Edition
 * https://github.com/jksunny/quake3e
-* https://github.com/OpenArena/engine

scripts/compile_engine.sh

@@ -186,6 +186,19 @@ for sofile in "$BUILD_DIR"/idtech3_*_*.so; do
 done
 shopt -u nullglob
 
+# FLUX CLI helper (external generation)
+if [ -f "$BUILD_DIR/flux_cli" ]; then
+  cp -f "$BUILD_DIR/flux_cli" "$RELEASE_DIR/flux_cli"
+  echo "Copied flux_cli -> $RELEASE_DIR/flux_cli"
+elif [ -f "$BUILD_DIR/src/external/src/cflux2/flux_cli" ]; then
+  cp -f "$BUILD_DIR/src/external/src/cflux2/flux_cli" "$RELEASE_DIR/flux_cli"
+  echo "Copied flux_cli -> $RELEASE_DIR/flux_cli"
+fi
+if [ -f "$BUILD_DIR/flux_cli.x86_64" ]; then
+  cp -f "$BUILD_DIR/flux_cli.x86_64" "$RELEASE_DIR/flux_cli.x86_64"
+  echo "Copied flux_cli -> $RELEASE_DIR/flux_cli.x86_64"
+fi
+
 # ImGui shared
 if [ -f "$BUILD_DIR/libimgui_shared.so" ]; then
   cp -f "$BUILD_DIR/libimgui_shared.so" "$RELEASE_DIR/"

src/client/cl_curl.c

@@ -1147,3 +1147,7 @@ qboolean Com_DL_Perform( download_t *dl )
 }
 
 #endif /* USE_CURL */
+
+#ifndef USE_CURL
+enum { cl_curl_unused = 0 };
+#endif

src/client/cl_jpeg.c

@@ -84,7 +84,7 @@ void CL_LoadJPG( const char *filename, unsigned char **pic, int *width, int *hei
 	/* This struct contains the JPEG decompression parameters and pointers to
 	* working space (which is allocated as needed by the JPEG library).
 	*/
-	struct jpeg_decompress_struct cinfo = {NULL};
+	struct jpeg_decompress_struct cinfo = {0};
 	/* We use our private extension JPEG error handler.
 	* Note that this struct must live as long as the main JPEG parameter
 	* struct, to avoid dangling-pointer problems.