mirror of
https://github.com/webui-dev/webui
synced 2025-03-28 21:13:17 +00:00
macOS Support
* Supporting macOS (Tested with Chrome, macOS 12) * Adding macOS C Makefiles * [Issue] We need to close Chrome to run the program again. We need to find the perfect command to run Chrome to fix this
This commit is contained in:
Hassan DRAGA
parent
4bb6846915
commit
c89d92fc80
11
.gitignore
vendored
11
.gitignore
vendored
@ -13,6 +13,7 @@
|
||||
*.o
|
||||
*.def
|
||||
*.obj
|
||||
*.dyn
|
||||
|
||||
# IDE
|
||||
.idea/
|
||||
@ -38,3 +39,13 @@ nul
|
||||
/zig-out/
|
||||
/examples/Zig/*/zig-cache/
|
||||
/examples/Zig/*/zig-out/
|
||||
|
||||
# macOS
|
||||
|
||||
.DS_Store
|
||||
.DS_Store?
|
||||
._*
|
||||
.Spotlight-V100
|
||||
.Trashes
|
||||
ehthumbs.db
|
||||
Thumbs.db
|
||||
|
||||
@ -72,7 +72,7 @@ Think of WebUI like a WebView controller, but instead of embedding the WebView c
|
||||
|
||||
- [Windows](https://github.com/alifcommunity/webui/tree/main/build/Windows)
|
||||
- [Linux](https://github.com/alifcommunity/webui/tree/main/build/Linux)
|
||||
- macOS (*Not Complete*)
|
||||
- [macOS](https://github.com/alifcommunity/webui/tree/main/build/macOS)
|
||||
|
||||
## Examples
|
||||
|
||||
|
||||
@ -7,35 +7,34 @@ INCLUDE=../../../include
|
||||
all: release
|
||||
|
||||
debug:
|
||||
# Static with Debug info
|
||||
# Static with Debug info
|
||||
@echo "Build WebUI Library (Debug Static)..."
|
||||
@clang -g -m64 -o mongoose.o -I "$(INCLUDE)" -c "$(SOURCE)/mongoose.c"
|
||||
@clang -DWEBUI_LOG -g -m64 -o webui.o -I "$(INCLUDE)" -c "$(SOURCE)/webui.c"
|
||||
@ar rc libwebui-2-static-x64.a webui.o mongoose.o
|
||||
@ranlib libwebui-2-static-x64.a
|
||||
# Dynamic with Debug info
|
||||
# Dynamic with Debug info
|
||||
@echo "Build WebUI Library (Debug Dynamic)..."
|
||||
@clang -g -fPIC -m64 -o mongoose.o -I "$(INCLUDE)" -c "$(SOURCE)/mongoose.c"
|
||||
@clang -DWEBUI_LOG -g -fPIC -m64 -o webui.o -I "$(INCLUDE)" -c "$(SOURCE)/webui.c"
|
||||
@clang -g -shared -o webui-2-x64.dyn webui.o mongoose.o
|
||||
# Clean
|
||||
#Clean
|
||||
@- rm -f *.o
|
||||
@echo "Done."
|
||||
|
||||
|
||||
release:
|
||||
# Static Release
|
||||
# Static Release
|
||||
@echo "Build WebUI Library (Release Static)..."
|
||||
@clang -Os -m64 -o mongoose.o -I "$(INCLUDE)" -c "$(SOURCE)/mongoose.c"
|
||||
@clang -Os -m64 -o webui.o -I "$(INCLUDE)" -c "$(SOURCE)/webui.c"
|
||||
@ar rc libwebui-2-static-x64.a webui.o mongoose.o
|
||||
@ranlib libwebui-2-static-x64.a
|
||||
# Dynamic Release
|
||||
# Dynamic Release
|
||||
@echo "Build WebUI Library (Release Dynamic)..."
|
||||
@clang -O3 -fPIC -m64 -o mongoose.o -I "$(INCLUDE)" -c "$(SOURCE)/mongoose.c"
|
||||
@clang -O3 -fPIC -m64 -o webui.o -I "$(INCLUDE)" -c "$(SOURCE)/webui.c"
|
||||
@clang -shared -o webui-2-x64.dyn webui.o mongoose.o
|
||||
# Clean
|
||||
# Clean
|
||||
@- rm -f *.o
|
||||
@echo "Done."
|
||||
|
||||
|
||||
43
examples/C/call_c_from_js/macOS/Clang/Makefile
Normal file
43
examples/C/call_c_from_js/macOS/Clang/Makefile
Normal file
@ -0,0 +1,43 @@
|
||||
# WebUI Library 2.1.1
|
||||
# C99 Example
|
||||
# macOS - Clang
|
||||
|
||||
LIB=../../../../../build/macOS/Clang
|
||||
INCLUDE=../../../../../include
|
||||
SOURCE=../..
|
||||
|
||||
all: release
|
||||
|
||||
debug:
|
||||
# Build Lib
|
||||
@cd "$(LIB)" && $(MAKE) debug
|
||||
# Static with Debug info
|
||||
@echo "Build C99 Example (Static Debug)..."
|
||||
@clang -g -m64 -o main "$(SOURCE)/main.c" -I "$(INCLUDE)" -L "$(LIB)" -lwebui-2-static-x64 -lpthread -lm
|
||||
# Dynamic with Debug info
|
||||
@echo "Build C99 Example (Dynamic Debug)..."
|
||||
@clang -g -m64 -o main-dyn "$(SOURCE)/main.c" -I "$(INCLUDE)" -L "$(LIB)" "$(LIB)/webui-2-x64.dyn" -lpthread -lm
|
||||
# Clean
|
||||
@- rm -f *.o
|
||||
@- rm -rf *.dSYM
|
||||
@echo "Done."
|
||||
|
||||
release:
|
||||
# Build Lib
|
||||
@cd "$(LIB)" && $(MAKE)
|
||||
# Static Release
|
||||
@echo "Build C99 Example (Static Release)..."
|
||||
@clang -Os -m64 -o main "$(SOURCE)/main.c" -I "$(INCLUDE)" -L "$(LIB)" -lwebui-2-static-x64 -lpthread -lm
|
||||
# Dynamic Release
|
||||
@echo "Build C99 Example (Dynamic Release)..."
|
||||
@clang -m64 -o main-dyn "$(SOURCE)/main.c" -I "$(INCLUDE)" -L "$(LIB)" "$(LIB)/webui-2-x64.dyn" -lpthread -lm
|
||||
# Clean
|
||||
@- rm -f *.o
|
||||
@- rm -rf *.dSYM
|
||||
@echo "Done."
|
||||
|
||||
clean:
|
||||
- rm -f *.o
|
||||
- rm -f *.dyn
|
||||
- rm -f *.a
|
||||
- rm -rf *.dSYM
|
||||
43
examples/C/call_js_from_c/macOS/Clang/Makefile
Normal file
43
examples/C/call_js_from_c/macOS/Clang/Makefile
Normal file
@ -0,0 +1,43 @@
|
||||
# WebUI Library 2.1.1
|
||||
# C99 Example
|
||||
# macOS - Clang
|
||||
|
||||
LIB=../../../../../build/macOS/Clang
|
||||
INCLUDE=../../../../../include
|
||||
SOURCE=../..
|
||||
|
||||
all: release
|
||||
|
||||
debug:
|
||||
# Build Lib
|
||||
@cd "$(LIB)" && $(MAKE) debug
|
||||
# Static with Debug info
|
||||
@echo "Build C99 Example (Static Debug)..."
|
||||
@clang -g -m64 -o main "$(SOURCE)/main.c" -I "$(INCLUDE)" -L "$(LIB)" -lwebui-2-static-x64 -lpthread -lm
|
||||
# Dynamic with Debug info
|
||||
@echo "Build C99 Example (Dynamic Debug)..."
|
||||
@clang -g -m64 -o main-dyn "$(SOURCE)/main.c" -I "$(INCLUDE)" -L "$(LIB)" "$(LIB)/webui-2-x64.dyn" -lpthread -lm
|
||||
# Clean
|
||||
@- rm -f *.o
|
||||
@- rm -rf *.dSYM
|
||||
@echo "Done."
|
||||
|
||||
release:
|
||||
# Build Lib
|
||||
@cd "$(LIB)" && $(MAKE)
|
||||
# Static Release
|
||||
@echo "Build C99 Example (Static Release)..."
|
||||
@clang -Os -m64 -o main "$(SOURCE)/main.c" -I "$(INCLUDE)" -L "$(LIB)" -lwebui-2-static-x64 -lpthread -lm
|
||||
# Dynamic Release
|
||||
@echo "Build C99 Example (Dynamic Release)..."
|
||||
@clang -m64 -o main-dyn "$(SOURCE)/main.c" -I "$(INCLUDE)" -L "$(LIB)" "$(LIB)/webui-2-x64.dyn" -lpthread -lm
|
||||
# Clean
|
||||
@- rm -f *.o
|
||||
@- rm -rf *.dSYM
|
||||
@echo "Done."
|
||||
|
||||
clean:
|
||||
- rm -f *.o
|
||||
- rm -f *.dyn
|
||||
- rm -f *.a
|
||||
- rm -rf *.dSYM
|
||||
44
examples/C/minimal/macOS/Clang/Makefile
Normal file
44
examples/C/minimal/macOS/Clang/Makefile
Normal file
@ -0,0 +1,44 @@
|
||||
# WebUI Library 2.1.1
|
||||
# C99 Example
|
||||
# macOS - Clang
|
||||
|
||||
LIB=../../../../../build/macOS/Clang
|
||||
INCLUDE=../../../../../include
|
||||
SOURCE=../..
|
||||
|
||||
all: release
|
||||
|
||||
debug:
|
||||
# Build Lib
|
||||
@cd "$(LIB)" && $(MAKE) debug
|
||||
# Static with Debug info
|
||||
@echo "Build C99 Example (Static Debug)..."
|
||||
@clang -g -m64 -o main "$(SOURCE)/main.c" -I "$(INCLUDE)" -L "$(LIB)" -lwebui-2-static-x64 -lpthread -lm
|
||||
# Dynamic with Debug info
|
||||
@echo "Build C99 Example (Dynamic Debug)..."
|
||||
@clang -g -m64 -o main-dyn "$(SOURCE)/main.c" -I "$(INCLUDE)" -L "$(LIB)" "$(LIB)/webui-2-x64.dyn" -lpthread -lm
|
||||
# Clean
|
||||
@- rm -f *.o
|
||||
@- rm -rf *.dSYM
|
||||
@echo "Done."
|
||||
|
||||
release:
|
||||
# Build Lib
|
||||
@cd "$(LIB)" && $(MAKE)
|
||||
# Static Release
|
||||
@echo "Build C99 Example (Static Release)..."
|
||||
@clang -Os -m64 -o main "$(SOURCE)/main.c" -I "$(INCLUDE)" -L "$(LIB)" -lwebui-2-static-x64 -lpthread -lm
|
||||
# Dynamic Release
|
||||
@echo "Build C99 Example (Dynamic Release)..."
|
||||
@clang -m64 -o main-dyn "$(SOURCE)/main.c" -I "$(INCLUDE)" -L "$(LIB)" "$(LIB)/webui-2-x64.dyn" -lpthread -lm
|
||||
# Clean
|
||||
@- rm -f *.o
|
||||
@- rm -rf *.dSYM
|
||||
@echo "Done."
|
||||
|
||||
clean:
|
||||
- rm -f *.o
|
||||
- rm -f *.dyn
|
||||
- rm -f *.a
|
||||
- rm -rf *.dSYM
|
||||
|
||||
44
examples/C/serve_a_folder/macOS/Clang/Makefile
Normal file
44
examples/C/serve_a_folder/macOS/Clang/Makefile
Normal file
@ -0,0 +1,44 @@
|
||||
# WebUI Library 2.1.1
|
||||
# C99 Example
|
||||
# macOS - Clang
|
||||
|
||||
LIB=../../../../../build/macOS/Clang
|
||||
INCLUDE=../../../../../include
|
||||
SOURCE=../..
|
||||
|
||||
all: release
|
||||
|
||||
debug:
|
||||
# Build Lib
|
||||
@cd "$(LIB)" && $(MAKE) debug
|
||||
# Static with Debug info
|
||||
@echo "Build C99 Example (Static Debug)..."
|
||||
@clang -g -m64 -o main "$(SOURCE)/main.c" -I "$(INCLUDE)" -L "$(LIB)" -lwebui-2-static-x64 -lpthread -lm
|
||||
# Dynamic with Debug info
|
||||
@echo "Build C99 Example (Dynamic Debug)..."
|
||||
@clang -g -m64 -o main-dyn "$(SOURCE)/main.c" -I "$(INCLUDE)" -L "$(LIB)" "$(LIB)/webui-2-x64.dyn" -lpthread -lm
|
||||
# Clean
|
||||
@- rm -f *.o
|
||||
@- rm -rf *.dSYM
|
||||
@echo "Done."
|
||||
|
||||
release:
|
||||
# Build Lib
|
||||
@cd "$(LIB)" && $(MAKE)
|
||||
# Static Release
|
||||
@echo "Build C99 Example (Static Release)..."
|
||||
@clang -Os -m64 -o main "$(SOURCE)/main.c" -I "$(INCLUDE)" -L "$(LIB)" -lwebui-2-static-x64 -lpthread -lm
|
||||
# Dynamic Release
|
||||
@echo "Build C99 Example (Dynamic Release)..."
|
||||
@clang -m64 -o main-dyn "$(SOURCE)/main.c" -I "$(INCLUDE)" -L "$(LIB)" "$(LIB)/webui-2-x64.dyn" -lpthread -lm
|
||||
# Clean
|
||||
@- rm -f *.o
|
||||
@- rm -rf *.dSYM
|
||||
@echo "Done."
|
||||
|
||||
clean:
|
||||
- rm -f *.o
|
||||
- rm -f *.dyn
|
||||
- rm -f *.a
|
||||
- rm -rf *.dSYM
|
||||
|
||||
39
examples/C/serve_a_folder/macOS/Clang/index.html
Normal file
39
examples/C/serve_a_folder/macOS/Clang/index.html
Normal file
@ -0,0 +1,39 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>WebUI - Serve a Folder Example (C99)</title>
|
||||
<style>
|
||||
body {
|
||||
color: white;
|
||||
background: #0F2027;
|
||||
background: -webkit-linear-gradient(to right, #3e6983, #314562, #10273e);
|
||||
background: linear-gradient(to right, #3e6983, #314562, #10273e);
|
||||
text-align: center;
|
||||
font-size: 16px;
|
||||
font-family: sans-serif;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<h3 id="title">Serve a Folder Example (C99)</h3>
|
||||
<br>
|
||||
<p id="description">
|
||||
You can edit this HTML file as you need.<br>
|
||||
Also, you can config WebUI to use Deno or Nodejs runtime for your JS/TS files.<br>
|
||||
<br>
|
||||
Please click on the link to switch to the second page<br>
|
||||
Or click on the button to switch to the second page programmatically.
|
||||
</p>
|
||||
<br>
|
||||
<h4><a href="second.html">Second Page As A Simple Link</a></h4>
|
||||
<br>
|
||||
<button id="SwitchToSecondPage">Switch to The Second Page Programmatically</button>
|
||||
<br>
|
||||
<br>
|
||||
<button id="OpenNewWindow">Open The Second Window</button>
|
||||
</body>
|
||||
|
||||
<!-- Connect this window to the background app -->
|
||||
<script src="/webui.js"></script>
|
||||
|
||||
</html>
|
||||
25
examples/C/serve_a_folder/macOS/Clang/second.html
Normal file
25
examples/C/serve_a_folder/macOS/Clang/second.html
Normal file
@ -0,0 +1,25 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>WebUI - Second Page (C99)</title>
|
||||
<style>
|
||||
body {
|
||||
color: white;
|
||||
background: #0F2027;
|
||||
background: -webkit-linear-gradient(to right, #3e6983, #314562, #10273e);
|
||||
background: linear-gradient(to right, #3e6983, #314562, #10273e);
|
||||
text-align: center;
|
||||
font-size: 16px;
|
||||
font-family: sans-serif;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<h3 id="title">This is the second page !</h3>
|
||||
<br>
|
||||
<button id="Exit">Call Exit()</button>
|
||||
</body>
|
||||
|
||||
<!-- Connect this window to the background app -->
|
||||
<script src="/webui.js"></script>
|
||||
</html>
|
||||
@ -18,3 +18,5 @@ DEL /Q /F /S "*.ilk" >nul 2>&1
|
||||
DEL /Q /F /S "*.obj" >nul 2>&1
|
||||
DEL /Q /F /S "*.res" >nul 2>&1
|
||||
DEL /Q /F /S "*.bak" >nul 2>&1
|
||||
|
||||
DEL /Q /F /S "*.DS_Store" >nul 2>&1
|
||||
|
||||
16
src/webui.c
16
src/webui.c
@ -1932,7 +1932,7 @@ bool _webui_browser_exist(webui_window_t* win, unsigned int browser) {
|
||||
sprintf(win->core.browser_path, "\"%s\\chrome.exe\"", browser_folder);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Search in `HKEY_CURRENT_USER` (If Google Chrome installed for one user)
|
||||
if(_webui_get_windows_reg_value(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\chrome.exe", "Path", browser_folder)) {
|
||||
@ -1953,7 +1953,7 @@ bool _webui_browser_exist(webui_window_t* win, unsigned int browser) {
|
||||
// Google Chrome on macOS
|
||||
if(_webui_cmd_sync("open -R -a \"Google Chrome\"", false) == 0) {
|
||||
|
||||
sprintf(win->core.browser_path, "/Applications/Google\\ Chrome.app/Contents/macOS/Google\\ Chrome");
|
||||
sprintf(win->core.browser_path, "open -W \"/Applications/Google Chrome.app\" --args");
|
||||
return true;
|
||||
}
|
||||
else
|
||||
@ -2060,7 +2060,7 @@ bool _webui_browser_exist(webui_window_t* win, unsigned int browser) {
|
||||
// Epic on macOS
|
||||
if(_webui_cmd_sync("open -R -a \"Epic\"", false) == 0) {
|
||||
|
||||
sprintf(win->core.browser_path, "/Applications/Epic\\ Epic.app/Contents/macOS/Epic\\ Epic");
|
||||
sprintf(win->core.browser_path, "open -W \"/Applications/Epic.app\" --args");
|
||||
return true;
|
||||
}
|
||||
else
|
||||
@ -2118,7 +2118,7 @@ bool _webui_browser_exist(webui_window_t* win, unsigned int browser) {
|
||||
// Vivaldi on macOS
|
||||
if(_webui_cmd_sync("open -R -a \"Vivaldi\"", false) == 0) {
|
||||
|
||||
sprintf(win->core.browser_path, "/Applications/Vivaldi\\ Vivaldi.app/Contents/macOS/Vivaldi\\ Vivaldi");
|
||||
sprintf(win->core.browser_path, "open -W \"/Applications/Vivaldi.app\" --args");
|
||||
return true;
|
||||
}
|
||||
else
|
||||
@ -2176,7 +2176,7 @@ bool _webui_browser_exist(webui_window_t* win, unsigned int browser) {
|
||||
// Brave on macOS
|
||||
if(_webui_cmd_sync("open -R -a \"Brave\"", false) == 0) {
|
||||
|
||||
sprintf(win->core.browser_path, "/Applications/Brave\\ Brave.app/Contents/macOS/Brave\\ Brave");
|
||||
sprintf(win->core.browser_path, "open -W \"/Applications/Brave.app\" --args");
|
||||
return true;
|
||||
}
|
||||
else
|
||||
@ -2234,7 +2234,7 @@ bool _webui_browser_exist(webui_window_t* win, unsigned int browser) {
|
||||
// Firefox on macOS
|
||||
if(_webui_cmd_sync("open -R -a \"firefox\"", false) == 0) {
|
||||
|
||||
sprintf(win->core.browser_path, "/Applications/Firefox.app/Contents/macOS/firefox");
|
||||
sprintf(win->core.browser_path, "open -W \"/Applications/Firefox.app\" --args");
|
||||
return true;
|
||||
}
|
||||
else
|
||||
@ -2295,7 +2295,7 @@ bool _webui_browser_exist(webui_window_t* win, unsigned int browser) {
|
||||
// Yandex on macOS
|
||||
if(_webui_cmd_sync("open -R -a \"Yandex\"", false) == 0) {
|
||||
|
||||
sprintf(win->core.browser_path, "/Applications/Yandex\\ Yandex.app/Contents/macOS/Yandex\\ Yandex");
|
||||
sprintf(win->core.browser_path, "open -W \"/Applications/Yandex.app\" --args");
|
||||
return true;
|
||||
}
|
||||
else
|
||||
@ -2353,7 +2353,7 @@ bool _webui_browser_exist(webui_window_t* win, unsigned int browser) {
|
||||
// Chromium on macOS
|
||||
if(_webui_cmd_sync("open -R -a \"Chromium\"", false) == 0) {
|
||||
|
||||
sprintf(win->core.browser_path, "/Applications/Chromium\\ Chromium.app/Contents/macOS/Chromium\\ Chromium");
|
||||
sprintf(win->core.browser_path, "open -W \"/Applications/Chromium.app\" --args");
|
||||
return true;
|
||||
}
|
||||
else
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user