Merge pull request #81 from auxves/macos-hotreload

Implement Hot Reload for macOS
tsoding · Feb 21, 2024 · f487007 · f487007
2 parents 0fa030b + b9df8ca
commit f487007
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 17 deletions.
diff --git a/nob.c b/nob.c
@@ -13,15 +13,11 @@
 
 #ifdef CONFIGURED
 
+#include "./src/targets.h"
 #include CONFIG_PATH
 
 #define RAYLIB_VERSION "5.0"
 
-#define TARGET_LINUX 0
-#define TARGET_WIN64_MINGW 1
-#define TARGET_WIN64_MSVC 2
-#define TARGET_MACOS 3
-
 static const char *raylib_modules[] = {
     "rcore",
     "raudio",

diff --git a/src/hotreload.h b/src/hotreload.h
@@ -4,6 +4,7 @@
 #include <stdbool.h>
 
 #include "plug.h"
+#include "targets.h"
 #include "config.h"
 
 #ifdef MUSIALIZER_HOTRELOAD

diff --git a/src/hotreload_linux.c → src/hotreload_posix.c b/src/hotreload_linux.c → src/hotreload_posix.c
@@ -5,7 +5,12 @@
 
 #include "hotreload.h"
 
-static const char *libplug_file_name = "libplug.so";
+#if MUSIALIZER_TARGET == TARGET_MACOS
+    static const char *libplug_file_name = "libplug.dylib";
+#else
+    static const char *libplug_file_name = "libplug.so";
+#endif
+
 static void *libplug = NULL;
 
 #define PLUG(name, ...) name##_t *name = NULL;

diff --git a/src/nob_linux.c b/src/nob_linux.c
@@ -34,7 +34,7 @@ bool build_musializer(void)
                 nob_cmd_append(&cmd, "-o", "./build/musializer");
                 nob_cmd_append(&cmd,
                     "./src/musializer.c",
-                    "./src/hotreload_linux.c");
+                    "./src/hotreload_posix.c");
                 nob_cmd_append(&cmd,
                     "-Wl,-rpath=./build/",
                     "-Wl,-rpath=./",

diff --git a/src/nob_macos.c b/src/nob_macos.c
@@ -8,8 +8,40 @@ bool build_musializer(void)
     Nob_Procs procs = {0};
 
 #ifdef MUSIALIZER_HOTRELOAD
-    nob_log(NOB_ERROR, "TODO: hotreloading is not supported on %s yet", NOB_ARRAY_GET(target_names, config.target));
-    nob_return_defer(false);
+    procs.count = 0;
+    cmd.count = 0;
+        // TODO: add a way to replace `cc` with something else GCC compatible on POSIX
+        // Like `clang` for instance
+        nob_cmd_append(&cmd, "clang");
+        nob_cmd_append(&cmd, "-Wall", "-Wextra", "-g");
+        nob_cmd_append(&cmd, "-I./build/");
+        nob_cmd_append(&cmd, "-I./raylib/raylib-"RAYLIB_VERSION"/src/");
+        nob_cmd_append(&cmd, "-fPIC", "-shared");
+        nob_cmd_append(&cmd, "-o", "./build/libplug.dylib");
+        nob_cmd_append(&cmd,
+            "./src/plug.c",
+            "./src/ffmpeg_linux.c");
+        nob_cmd_append(&cmd, "./build/raylib/macos/libraylib.dylib");
+        nob_cmd_append(&cmd, "-lm", "-ldl", "-lpthread");
+    nob_da_append(&procs, nob_cmd_run_async(cmd));
+
+    cmd.count = 0;
+        nob_cmd_append(&cmd, "clang");
+        nob_cmd_append(&cmd, "-Wall", "-Wextra", "-g");
+        nob_cmd_append(&cmd, "-I./build/");
+        nob_cmd_append(&cmd, "-I./raylib/raylib-"RAYLIB_VERSION"/src/");
+        nob_cmd_append(&cmd, "-o", "./build/musializer");
+        nob_cmd_append(&cmd,
+            "./src/musializer.c",
+            "./src/hotreload_posix.c");
+        nob_cmd_append(&cmd, "./build/raylib/macos/libraylib.dylib");
+        nob_cmd_append(&cmd, "-lm", "-ldl", "-lpthread");
+        nob_cmd_append(&cmd, "-rpath", "./build");
+        nob_cmd_append(&cmd, "-rpath", "./build/raylib/macos");
+        nob_cmd_append(&cmd, "-rpath", "./");
+        nob_cmd_append(&cmd, "-rpath", "./raylib/macos");
+    nob_da_append(&procs, nob_cmd_run_async(cmd));
+    if (!nob_procs_wait(procs)) nob_return_defer(false);
 #else
     cmd.count = 0;
         nob_cmd_append(&cmd, "clang");
@@ -21,8 +53,7 @@ bool build_musializer(void)
             "./src/plug.c",
             "./src/ffmpeg_linux.c",
             "./src/musializer.c");
-        nob_cmd_append(&cmd,
-            nob_temp_sprintf("./build/raylib/%s/libraylib.a", MUSIALIZER_TARGET_NAME));
+        nob_cmd_append(&cmd, "./build/raylib/macos/libraylib.a");
 
         nob_cmd_append(&cmd, "-framework", "CoreVideo");
         nob_cmd_append(&cmd, "-framework", "IOKit");
@@ -97,15 +128,17 @@ bool build_raylib(void)
         if (!nob_cmd_run_sync(cmd)) nob_return_defer(false);
     }
 #else
-    const char *libraylib_path = nob_temp_sprintf("%s/libraylib.so", build_path);
+    const char *libraylib_path = nob_temp_sprintf("%s/libraylib.dylib", build_path);
 
     if (nob_needs_rebuild(libraylib_path, object_files.items, object_files.count)) {
-        if (config.target != TARGET_LINUX) {
-            nob_log(NOB_ERROR, "TODO: dynamic raylib for %s is not supported yet", NOB_ARRAY_GET(target_names, config.target));
-            nob_return_defer(false);
-        }
         nob_cmd_append(&cmd, "cc");
-        nob_cmd_append(&cmd, "-shared");
+        nob_cmd_append(&cmd, "-shared", "-fPIC");
+        nob_cmd_append(&cmd, "-framework", "CoreVideo");
+        nob_cmd_append(&cmd, "-framework", "IOKit");
+        nob_cmd_append(&cmd, "-framework", "Cocoa");
+        nob_cmd_append(&cmd, "-framework", "GLUT");
+        nob_cmd_append(&cmd, "-framework", "OpenGL");
+        nob_cmd_append(&cmd, "-install_name", "@rpath/libraylib.dylib");
         nob_cmd_append(&cmd, "-o", libraylib_path);
         for (size_t i = 0; i < NOB_ARRAY_LEN(raylib_modules); ++i) {
             const char *input_path = nob_temp_sprintf("%s/%s.o", build_path, raylib_modules[i]);

diff --git a/src/plug.c b/src/plug.c
@@ -6,6 +6,7 @@
 #include <string.h>
 #include <complex.h>
 
+#include "targets.h"
 #include "config.h"
 #include "plug.h"
 #include "ffmpeg.h"

diff --git a/src/targets.h b/src/targets.h
@@ -0,0 +1,9 @@
+#ifndef TARGETS_H_
+#define TARGETS_H_
+
+#define TARGET_LINUX 0
+#define TARGET_WIN64_MINGW 1
+#define TARGET_WIN64_MSVC 2
+#define TARGET_MACOS 3
+
+#endif // TARGETS_H_