Failed to build SDL_image if it is a submodule under a parent module

[wyatt-wong]

I performed a few more testings and come up with the following:

If SDL_image is at the top level and you run cmake and make then the build will be successful. A top level structure looks like this:

/
⎣SDL_image

If SDL_image is a submodule under a parent module and you run cmake in the parent module, when you run make in the parent module which build the source of both parent module and submodule, then the build will fail in SDL_image with missing <avif/avif.h> error. The submodule structure looks like this:

/
⎣ some_folder
   ⎣SDL_image

A temporary workaround is to copy avif/* and webp/* to the SDL_image/include folder before running make. That means:

cp -pr ~/some_folder/SDL_image/VisualC/external/include/avif/ ~/some_folder/SDL_image/include
cp -pr ~/some_folder/SDL_image/VisualC/external/include/webp/ ~/some_folder/SDL_image/include
make

[madebr]

That workaround mixes our vendored avif headers with your system avif library. It should work because of abi compatibility, but is not a good one nonetheless.

What is the difference in CMakeCache.txt between both configurations?

[wyatt-wong]

Is there a fix to build SDL_image as a submodule without copying those header files to the include folder ?

I found that SDL was able to build as a submodule without copying any files. But SDL_image fail to build as a submodule without copying those header files.

[wyatt-wong]

That workaround mixes our vendored avif headers with your system avif library. It should work because of abi compatibility, but is not a good one nonetheless.

What is the difference in CMakleCache.txt between both configurations?

Here is CMakeCache.txt from SDL_image as parent folder
CMakeCache.txt

Here is CMakeCache.txt from SDL_image as a submodule
CMakeCache.txt

[madebr]

Nothing unexpected can be seen in these caches.

What's the output of this command? (This should answer my previous question)

find /usr/local 2>/dev/null |  grep avif

[wyatt-wong]

find /usr/local 2>/dev/null | grep avif

/usr/local/bin/avifgainmaputil
/usr/local/bin/avifenc
/usr/local/bin/avifdec
/usr/local/include/avif
/usr/local/var/homebrew/linked/libavif
/usr/local/lib/pkgconfig/libavif.pc
/usr/local/lib/libavif.dylib
/usr/local/lib/cmake/libavif
/usr/local/lib/libavif.16.dylib
/usr/local/lib/libavif.16.2.1.dylib
/usr/local/opt/libavif
/usr/local/Cellar/libheif/1.19.7/share/libheif/example.avif
/usr/local/Cellar/libavif
/usr/local/Cellar/libavif/1.2.1
/usr/local/Cellar/libavif/1.2.1/INSTALL_RECEIPT.json
/usr/local/Cellar/libavif/1.2.1/LICENSE
/usr/local/Cellar/libavif/1.2.1/bin
/usr/local/Cellar/libavif/1.2.1/bin/avifgainmaputil
/usr/local/Cellar/libavif/1.2.1/bin/avifenc
/usr/local/Cellar/libavif/1.2.1/bin/avifdec
/usr/local/Cellar/libavif/1.2.1/CHANGELOG.md
/usr/local/Cellar/libavif/1.2.1/.brew
/usr/local/Cellar/libavif/1.2.1/.brew/libavif.rb
/usr/local/Cellar/libavif/1.2.1/include
/usr/local/Cellar/libavif/1.2.1/include/avif
/usr/local/Cellar/libavif/1.2.1/include/avif/avif_cxx.h
/usr/local/Cellar/libavif/1.2.1/include/avif/avif.h
/usr/local/Cellar/libavif/1.2.1/sbom.spdx.json
/usr/local/Cellar/libavif/1.2.1/README.md
/usr/local/Cellar/libavif/1.2.1/lib
/usr/local/Cellar/libavif/1.2.1/lib/pkgconfig
/usr/local/Cellar/libavif/1.2.1/lib/pkgconfig/libavif.pc
/usr/local/Cellar/libavif/1.2.1/lib/libavif.dylib
/usr/local/Cellar/libavif/1.2.1/lib/cmake
/usr/local/Cellar/libavif/1.2.1/lib/cmake/libavif
/usr/local/Cellar/libavif/1.2.1/lib/cmake/libavif/libavif-config-release.cmake
/usr/local/Cellar/libavif/1.2.1/lib/cmake/libavif/libavif-config.cmake
/usr/local/Cellar/libavif/1.2.1/lib/cmake/libavif/libavif-config-version.cmake
/usr/local/Cellar/libavif/1.2.1/lib/libavif.16.dylib
/usr/local/Cellar/libavif/1.2.1/lib/libavif.16.2.1.dylib
/usr/local/Cellar/libavif/1.2.1/share
/usr/local/Cellar/libavif/1.2.1/share/libavif
/usr/local/Cellar/libavif/1.2.1/share/libavif/examples
/usr/local/Cellar/libavif/1.2.1/share/libavif/examples/avif_example_decode_streaming.c
/usr/local/Cellar/libavif/1.2.1/share/libavif/examples/avif_example_decode_memory.c
/usr/local/Cellar/libavif/1.2.1/share/libavif/examples/avif_example_decode_file.c
/usr/local/Cellar/libavif/1.2.1/share/libavif/examples/avif_example_encode.c
/usr/local/share/libavif
/usr/local/share/mime/image/avif.xml

It was interesting that your command couldn't find avif.h in this location:

wyattwong➜  ~ ls -l /usr/local/include/avif/*
-rw-r--r--  1 wyattwong  admin   1065 Mar 17 17:48 /usr/local/include/avif/avif_cxx.h
-rw-r--r--  1 wyattwong  admin  89917 Mar 17 17:48 /usr/local/include/avif/avif.h

[wyatt-wong]

After further checking, the avif folder was a symbolic link, so /usr/local/include/avif/avif.h is also a symbolic link as follows:

lrwxr-xr-x  1 wyattwong  admin  36 Mar 18 10:14 /usr/local/include/avif -> ../Cellar/libavif/1.2.1/include/avif

[wyatt-wong]

Is there any update ?

[madebr]

I don't understand what's going wrong on your system.
Have you tried removing and installing avif again from brew?

[madebr]

Save the shell script below as /tmp/run.sh, and run it as sh /tmp/run.sh.
Please provide its output as a log file.

run.sh

#!/bin/sh

set -e

write_avif_cmake_project() {

mkdir -p "$1"

cat <<EOF >"$1/CMakeLists.txt"
cmake_minimum_required(VERSION 3.20)
project(avif_in_main C)
find_package(libavif REQUIRED)
add_executable(avif_exe main.c)
if(NOT TARGET avif)
  message(WARNING "avif is NOT a target")
endif()
target_link_libraries(avif_exe PRIVATE avif)
EOF

cat <<EOF >"$1/main.c"
#include <avif/avif.h>
#include <stdio.h>
int main(int argc, char *argv[]) {
 char buffer[256];
 (void) argc;
 (void) argv;
 avifCodecVersions(buffer);
 buffer[sizeof(buffer) - 1] = '\0';
 printf("avifVersion: %s\n", avifVersion());
 printf("avifVeavifCodecVersionsrsion: %s\n", buffer);
 return 0;
}
EOF
}

rm -rf /tmp/cmake-avif
write_avif_cmake_project /tmp/cmake-avif/avif_mainproject

mkdir -p /tmp/cmake-avif/avif_subproject
cat <<EOF >/tmp/cmake-avif/avif_subproject/CMakeLists.txt
cmake_minimum_required(VERSION 3.20)
project(mainproject)
add_subdirectory(subproject)
EOF

write_avif_cmake_project /tmp/cmake-avif/avif_subproject/subproject

echo "Configure avif in main project:"
cmake -S /tmp/cmake-avif/avif_mainproject -B /tmp/cmake-avif/avif_mainproject/build -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=/tmp/cmake-avif/avif_mainproject/build 
echo "Build avif in main project:"
cmake --build /tmp/cmake-avif/avif_mainproject/build --verbose
echo "Run avif in main project:"
/tmp/cmake-avif/avif_mainproject/build/avif_exe || true

echo "Configure avif in subproject:"
cmake -S /tmp/cmake-avif/avif_subproject -B /tmp/cmake-avif/avif_subproject/build -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=/tmp/cmake-avif/avif_subproject/build 
echo "Build avif in subproject:"
cmake --build /tmp/cmake-avif/avif_subproject/build
echo "Run avif in sub project:"
/tmp/cmake-avif/avif_subproject/build/avif_exe || true

Please also provide 2 build log files:

• a successful SDL3_image build (when building it as the main project)
• a failing SDL3_image build (when building it as a subproject)

[wyatt-wong]

I don't understand what's going wrong on your system.
Have you tried removing and installing avif again from brew?

How do I install avif ? I supposed you mean brew install libavif, right ?

I think I also need to install webp as well.

[madebr]

I don't understand what's going wrong on your system.
Have you tried removing and installing avif again from brew?

How do I install avif ? I supposed you mean brew install libavif, right ?

Yes. /usr/local/Cellar is owned by brew.

I think I also need to install webp as well.

Maybe. I don't know what dependencies brew will install. SDL3_image builds fine even when it cannot find webp development libraries.

[wyatt-wong]

I don't understand what's going wrong on your system.
Have you tried removing and installing avif again from brew?

How do I install avif ? I supposed you mean brew install libavif, right ?

Yes. /usr/local/Cellar is owned by brew.

I think I also need to install webp as well.

Maybe. I don't know what dependencies brew will install. SDL3_image builds fine even when it cannot find webp development libraries.

I have already reinstall avif with brew reinstall avif and the build as submodule still failed

[wyatt-wong]

Save the shell script below as /tmp/run.sh, and run it as sh /tmp/run.sh. Please provide its output as a log file.

run.sh
#!/bin/sh

set -e

write_avif_cmake_project() {

mkdir -p "$1"

cat <"$1/CMakeLists.txt"
cmake_minimum_required(VERSION 3.20)
project(avif_in_main C)
find_package(libavif REQUIRED)
add_executable(avif_exe main.c)
if(NOT TARGET avif)
message(WARNING "avif is NOT a target")
endif()
target_link_libraries(avif_exe PRIVATE avif)
EOF

cat <"$1/main.c"
#include <avif/avif.h>
#include <stdio.h>
int main(int argc, char *argv[]) {
char buffer[256];
(void) argc;
(void) argv;
avifCodecVersions(buffer);
buffer[sizeof(buffer) - 1] = '\0';
printf("avifVersion: %s\n", avifVersion());
printf("avifVeavifCodecVersionsrsion: %s\n", buffer);
return 0;
}
EOF
}

rm -rf /tmp/cmake-avif
write_avif_cmake_project /tmp/cmake-avif/avif_mainproject

mkdir -p /tmp/cmake-avif/avif_subproject
cat </tmp/cmake-avif/avif_subproject/CMakeLists.txt
cmake_minimum_required(VERSION 3.20)
project(mainproject)
add_subdirectory(subproject)
EOF

write_avif_cmake_project /tmp/cmake-avif/avif_subproject/subproject

echo "Configure avif in main project:"
cmake -S /tmp/cmake-avif/avif_mainproject -B /tmp/cmake-avif/avif_mainproject/build -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=/tmp/cmake-avif/avif_mainproject/build
echo "Build avif in main project:"
cmake --build /tmp/cmake-avif/avif_mainproject/build --verbose
echo "Run avif in main project:"
/tmp/cmake-avif/avif_mainproject/build/avif_exe || true

echo "Configure avif in subproject:"
cmake -S /tmp/cmake-avif/avif_subproject -B /tmp/cmake-avif/avif_subproject/build -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=/tmp/cmake-avif/avif_subproject/build
echo "Build avif in subproject:"
cmake --build /tmp/cmake-avif/avif_subproject/build
echo "Run avif in sub project:"
/tmp/cmake-avif/avif_subproject/build/avif_exe || true
Please also provide 2 build log files:

• a successful SDL3_image build (when building it as the main project)
• a failing SDL3_image build (when building it as a subproject)

Here it is. I have already provided the build log of SDL_image as standalone module and as a submodule to you previously.

wyattwong➜  /tmp ./run.sh
Configure avif in main project:
-- The C compiler identification is AppleClang 17.0.0.17000013
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working C compiler: /usr/bin/cc - skipped
-- Detecting C compile features
-- Detecting C compile features - done
-- Configuring done (56.7s)
-- Generating done (0.0s)
-- Build files have been written to: /tmp/cmake-avif/avif_mainproject/build
Build avif in main project:
Change Dir: '/tmp/cmake-avif/avif_mainproject/build'

Run Build Command(s): /usr/local/bin/cmake -E env VERBOSE=1 /usr/local/bin/make -f Makefile
/usr/local/bin/cmake -S/tmp/cmake-avif/avif_mainproject -B/tmp/cmake-avif/avif_mainproject/build --check-build-system CMakeFiles/Makefile.cmake 0
/usr/local/bin/cmake -E cmake_progress_start /tmp/cmake-avif/avif_mainproject/build/CMakeFiles /tmp/cmake-avif/avif_mainproject/build//CMakeFiles/progress.marks
/usr/local/bin/make  -f CMakeFiles/Makefile2 all
make[1]: Entering directory '/private/tmp/cmake-avif/avif_mainproject/build'
/usr/local/bin/make  -f CMakeFiles/avif_exe.dir/build.make CMakeFiles/avif_exe.dir/depend
make[2]: Entering directory '/private/tmp/cmake-avif/avif_mainproject/build'
cd /tmp/cmake-avif/avif_mainproject/build && /usr/local/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/cmake-avif/avif_mainproject /tmp/cmake-avif/avif_mainproject /tmp/cmake-avif/avif_mainproject/build /tmp/cmake-avif/avif_mainproject/build /tmp/cmake-avif/avif_mainproject/build/CMakeFiles/avif_exe.dir/DependInfo.cmake "--color="
make[2]: Leaving directory '/private/tmp/cmake-avif/avif_mainproject/build'
/usr/local/bin/make  -f CMakeFiles/avif_exe.dir/build.make CMakeFiles/avif_exe.dir/build
make[2]: Entering directory '/private/tmp/cmake-avif/avif_mainproject/build'
[ 50%] Building C object CMakeFiles/avif_exe.dir/main.c.o
/usr/bin/cc -DAVIF_DLL   -MD -MT CMakeFiles/avif_exe.dir/main.c.o -MF CMakeFiles/avif_exe.dir/main.c.o.d -o CMakeFiles/avif_exe.dir/main.c.o -c /tmp/cmake-avif/avif_mainproject/main.c
[100%] Linking C executable avif_exe
/usr/local/bin/cmake -E cmake_link_script CMakeFiles/avif_exe.dir/link.txt --verbose=1
/usr/bin/cc -Wl,-search_paths_first -Wl,-headerpad_max_install_names CMakeFiles/avif_exe.dir/main.c.o -o avif_exe  /usr/local/lib/libavif.16.2.1.dylib
make[2]: Leaving directory '/private/tmp/cmake-avif/avif_mainproject/build'
[100%] Built target avif_exe
make[1]: Leaving directory '/private/tmp/cmake-avif/avif_mainproject/build'
/usr/local/bin/cmake -E cmake_progress_start /tmp/cmake-avif/avif_mainproject/build/CMakeFiles 0

Run avif in main project:
avifVersion: 1.2.1
avifVeavifCodecVersionsrsion: aom [enc/dec]:3.12.1
Configure avif in subproject:
-- The C compiler identification is AppleClang 17.0.0.17000013
-- The CXX compiler identification is AppleClang 17.0.0.17000013
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working C compiler: /usr/bin/cc - skipped
-- Detecting C compile features
-- Detecting C compile features - done
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Check for working CXX compiler: /usr/bin/c++ - skipped
-- Detecting CXX compile features
-- Detecting CXX compile features - done
-- Configuring done (17.7s)
-- Generating done (0.0s)
-- Build files have been written to: /tmp/cmake-avif/avif_subproject/build
Build avif in subproject:
[ 50%] Building C object subproject/CMakeFiles/avif_exe.dir/main.c.o
[100%] Linking C executable ../avif_exe
[100%] Built target avif_exe
Run avif in sub project:
avifVersion: 1.2.1
avifVeavifCodecVersionsrsion: aom [enc/dec]:3.12.1

[madebr]

What your log tells me is that you have a functional libavif installation, not requiring any extra -I arguments.

I'd suggest to reduce gssquared until you can get SDL3_image building.
Something in its CMakeLists.txt is interfering with SDL3_image.
It contains some suspicious commands which might configure CMake.

I had to apply a patch to get it building with gcc/g++ (instead of clang for c++).
The patch also includes changes to disable non-essential commands (things that might be required for gssquared, but might interfere with the SDL buildsystems)

patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 11ad462..f2caee4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ project(gssquared)
 set(BUILD_SHARED_LIBS OFF)
 
 # Mac-specific settings
-if(APPLE)
+if(0 AND APPLE)
     set(CMAKE_OSX_SYSROOT "/Library/Developer/CommandLineTools/SDKs/MacOSX15.sdk")
     set(CMAKE_OSX_DEPLOYMENT_TARGET "15.0")
 
@@ -148,15 +148,15 @@ endif()
 
 function(configure_sdl_builds)
     set(BUILD_SHARED_LIBS ON)
-    
+
     # Force SDL to build with the correct SDK
-    if(APPLE)
+    if(0 AND APPLE)
         set(CMAKE_OSX_SYSROOT "/Library/Developer/CommandLineTools/SDKs/MacOSX15.sdk" CACHE PATH "SDK path" FORCE)
         set(CMAKE_OSX_DEPLOYMENT_TARGET "15.0" CACHE STRING "Deployment target" FORCE)
     endif()
-    
+
     set(SDL_SHARED ON)
-    
+
     # Force rebuild SDL with these settings
     add_subdirectory(${CMAKE_SOURCE_DIR}/vendored/SDL EXCLUDE_FROM_ALL)
     add_subdirectory(${CMAKE_SOURCE_DIR}/vendored/SDL_image EXCLUDE_FROM_ALL)
@@ -176,9 +176,6 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 
-# Set the compiler to Clang++
-set(CMAKE_CXX_COMPILER clang++)
-
 configure_sdl_builds()
 
 # Set default build type to Release if not specified
diff --git a/src/clock.hpp b/src/clock.hpp
index 1d11343..68a6535 100644
--- a/src/clock.hpp
+++ b/src/clock.hpp
@@ -21,13 +21,13 @@
 
 struct cpu_state; // forward declaration
 
-typedef enum clock_mode {
+typedef enum tclock_mode {
     CLOCK_FREE_RUN = 0,
     CLOCK_1_024MHZ,
     CLOCK_2_8MHZ,
     CLOCK_4MHZ,
     NUM_CLOCK_MODES
-} clock_mode;
+} tclock_mode;
 
 typedef struct {
     uint64_t hz_rate;
diff --git a/src/cpu.cpp b/src/cpu.cpp
index 6309e4e..76a44e5 100644
--- a/src/cpu.cpp
+++ b/src/cpu.cpp
@@ -54,7 +54,7 @@ uint64_t cycle_durations_ns[] = {
 uint64_t cycles_per_burst[] = { 17008, 66665, 46666, 17008 };
  */
 
-void set_clock_mode(cpu_state *cpu, clock_mode mode) {
+void set_clock_mode(cpu_state *cpu, tclock_mode mode) {
     // Get the conversion factor for mach_absolute_time to nanoseconds
 /*     mach_timebase_info_data_t info;
     mach_timebase_info(&info);
@@ -89,7 +89,7 @@ void set_clock_mode(cpu_state *cpu, clock_mode mode) {
 } */
 
 void toggle_clock_mode(cpu_state *cpu) {
-    set_clock_mode(cpu, (clock_mode)((cpu->clock_mode + 1) % NUM_CLOCK_MODES));
+    set_clock_mode(cpu, (tclock_mode)((cpu->clock_mode + 1) % NUM_CLOCK_MODES));
     fprintf(stdout, "Clock mode: %d HZ_RATE: %llu\n", cpu->clock_mode, cpu->HZ_RATE);
 }
 
diff --git a/src/cpu.hpp b/src/cpu.hpp
index 4374a47..4e3f202 100644
--- a/src/cpu.hpp
+++ b/src/cpu.hpp
@@ -106,11 +106,11 @@ struct cpu_state {
     uint64_t boot_time; 
     union {
         struct {
-            #if defined(__LITTLE_ENDIAN__)
+            #if SDL_BYTEORDER == SDL_LIL_ENDIAN
                 uint16_t pc;  /* Program Counter - lower 16 bits of the 24-bit program counter */
                 uint8_t pb;   /* Program Bank - upper 8 bits of the 24-bit program counter */
                 uint8_t unused; /* Padding to align with 32-bit full_pc */
-            #elif defined(__BIG_ENDIAN__)
+            #elif SDL_BYTEORDER == SDL_BIG_ENDIAN
                 uint8_t unused; /* Padding to align with 32-bit full_pc */
                 uint8_t pb;   /* Program Bank - upper 8 bits of the 24-bit program counter */
                 uint16_t pc;  /* Program Counter - lower 16 bits of the 24-bit program counter */
@@ -125,10 +125,10 @@ struct cpu_state {
     uint16_t sp;  /* Stack Pointer */
     union {
         struct {
-            #if defined(__LITTLE_ENDIAN__)
+            #if SDL_BYTEORDER == SDL_LIL_ENDIAN
                 uint8_t a_lo;  /* Lower 8 bits of Accumulator */
                 uint8_t a_hi;  /* Upper 8 bits of Accumulator */
-            #elif defined(__BIG_ENDIAN__)
+            #elif SDL_BYTEORDER == SDL_BIG_ENDIAN
                 uint8_t a_hi;  /* Upper 8 bits of Accumulator */
                 uint8_t a_lo;  /* Lower 8 bits of Accumulator */
             #else
@@ -139,10 +139,10 @@ struct cpu_state {
     };
     union {
         struct {
-            #if defined(__LITTLE_ENDIAN__)
+            #if SDL_BYTEORDER == SDL_LIL_ENDIAN
                 uint8_t x_lo;  /* Lower 8 bits of X Index Register */
                 uint8_t x_hi;  /* Upper 8 bits of X Index Register */
-            #elif defined(__BIG_ENDIAN__)
+            #elif SDL_BYTEORDER == SDL_BIG_ENDIAN
                 uint8_t x_hi;  /* Upper 8 bits of X Index Register */
                 uint8_t x_lo;  /* Lower 8 bits of X Index Register */
             #else
@@ -153,10 +153,10 @@ struct cpu_state {
     };
     union {
         struct {
-            #if defined(__LITTLE_ENDIAN__)
+            #if SDL_BYTEORDER == SDL_LIL_ENDIAN
                 uint8_t y_lo;  /* Lower 8 bits of Y Index Register */
                 uint8_t y_hi;  /* Upper 8 bits of Y Index Register */
-            #elif defined(__BIG_ENDIAN__)
+            #elif SDL_BYTEORDER == SDL_BIG_ENDIAN
                 uint8_t y_hi;  /* Upper 8 bits of Y Index Register */
                 uint8_t y_lo;  /* Lower 8 bits of Y Index Register */
             #else
@@ -200,7 +200,7 @@ struct cpu_state {
     uint64_t cycle_duration_ns;
     //uint64_t cycle_duration_ticks;
     uint64_t HZ_RATE;
-    clock_mode clock_mode = CLOCK_FREE_RUN;
+    tclock_mode clock_mode = CLOCK_FREE_RUN;
     float e_mhz = 0;
     
     execute_next_fn execute_next;
@@ -237,7 +237,7 @@ void run_cpus(void) ;
 
 void toggle_clock_mode(cpu_state *cpu);
 
-void set_clock_mode(cpu_state *cpu, clock_mode mode);
+void set_clock_mode(cpu_state *cpu, tclock_mode mode);
 
 const char* processor_get_name(int processor_type);
 
diff --git a/src/devices/mockingboard/mb.cpp b/src/devices/mockingboard/mb.cpp
index c418607..1f4f2fe 100644
--- a/src/devices/mockingboard/mb.cpp
+++ b/src/devices/mockingboard/mb.cpp
@@ -1213,9 +1213,9 @@ void init_slot_mockingboard(cpu_state *cpu, SlotType_t slot) {
 
 /** Init audio stream for the mockingboard device */
     SDL_AudioSpec spec = {
-        .freq = 44100,
         .format = SDL_AUDIO_F32LE,
-        .channels = 2
+        .channels = 2,
+        .freq = 44100,
     };
 
     SDL_AudioStream *stream = SDL_CreateAudioStream(&spec, NULL);
diff --git a/src/platforms.hpp b/src/platforms.hpp
index 1bd6b3a..2947c9f 100644
--- a/src/platforms.hpp
+++ b/src/platforms.hpp
@@ -37,7 +37,7 @@ struct platform_info {
     const char* rom_dir;        // Directory under roms/
     uint16_t rom_base_addr;    // Base address for the roms
     const int processor_type;   // processor type
-    const clock_mode default_clock_mode; // default clock mode for this platform at startup.
+    const tclock_mode default_clock_mode; // default clock mode for this platform at startup.
 };
 
 typedef uint8_t char_rom_t[256 * 8];