temporaty fix gbio build

onbings · Aug 30, 2024 · c9ab1be · c9ab1be
1 parent c0fe101
commit c9ab1be
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -230,8 +230,8 @@ set(SYSTEM_FILES
 	src/boftimecode.cpp
 	include/bofstd/bofvideostandard.h
 	src/bofvideostandard.cpp
-	include/bofstd/bofaudio.h
-	src/bofaudio.cpp
+	#include/bofstd/bofaudio.h
+	#src/bofaudio.cpp
 	include/bofstd/bofaudiostandard.h
 	src/bofaudiostandard.cpp
 	include/bofstd/bofdatetime.h

diff --git a/lib/include/bofstd/bofstd.h b/lib/include/bofstd/bofstd.h
@@ -40,13 +40,13 @@ cmake -DCMAKE_TOOLCHAIN_FILE=C:/pro/vcpkg/scripts/buildsystems/vcpkg.cmake -DBUI
 #include <ws2tcpip.h>
 typedef bool(WINAPI *BofSignalHandler)(uint32_t);
 #else
-#if defined(__EMSCRIPTEN__)
-#include <emscripten/html5.h> //for emscripten_performance_now in Bof_RdTsc
-using BofEmscriptenCallback = std::function<BOFERR(void *)>;
-#else
-#include <x86intrin.h> //for __rdtsc in Bof_RdTsc
-#endif
-typedef bool (*BofSignalHandler)(uint32_t);
+# if defined(__EMSCRIPTEN__)
+#   include <emscripten/html5.h> //for emscripten_performance_now in Bof_RdTsc
+    using BofEmscriptenCallback = std::function<BOFERR(void *)>;
+# elif defined(__x86_64__) or defined(__i386__)
+#   include <x86intrin.h> //for __rdtsc in Bof_RdTsc
+# endif
+  typedef bool (*BofSignalHandler)(uint32_t);
 #endif
 
 using BofAssertCallback = std::function<BOFERR(const std::string &_rFile_S, uint32_t _Line_U32, const std::string &_rMasg_S)>;
@@ -425,7 +425,7 @@ const uintptr_t BOF_INVALID_HANDLE_VALUE = ((uintptr_t)-1);
 #define BOF_ALIGN_ADD_NB_PADDING_BYTE(v, a) \
   ((((v) % (a)) != 0) ? ((a) - ((v) % (a))) : 0) // If aligned add a zone of a byte before the next one
 #define BOF_ALIGN_VALUE_ON(v, a) (((v) + (a) - 1) & ~((a) - 1))
-// #define BOF_SNPRINTF_NULL_CLIPPED(pBuffer, MaxBufferSize, Format, ...)
+// #define snprintf(pBuffer, MaxBufferSize, Format, ...)
 //   {
 //     snprintf(pBuffer, MaxBufferSize, Format, ##__VA_ARGS__);
 //     pBuffer[MaxBufferSize - 1] = 0;
@@ -685,8 +685,10 @@ inline BOFSTD_EXPORT uint64_t Bof_RdTsc()
   return (((uint64_t)High_U32 << 32) | Low_U32);
   */
   return static_cast<uint64_t>(emscripten_performance_now() * 1000000.0); // Calls JavaScript performance.now(), returns a high precision wallclock time value in msecs.
-#else
+#elif defined(__x86_64__) or defined(__i386__)
   return __rdtsc();
+#else
+  return 0;
 #endif
 }
 BOFSTD_EXPORT uint32_t Bof_MeasureCpuSpeedInMHz();