AstralTransRocketries/Cubyz
1
0
Fork 0
mirror of https://github.com/PixelGuys/Cubyz.git synced 2025-09-08 03:29:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update zig.

Browse Source
This commit is contained in:
IntegratedQuantum 2023-10-17 17:34:54 +02:00
parent e48cf8f763
commit cc85c8af1d
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
build.zig
View File

@ -27,14 +27,15 @@ pub fn build(b: *std.build.Builder) !void {
.target = target, .target = target,
.optimize = optimize, .optimize = optimize,
}); });
const c_flags = &[_][]const u8{"-g", "-O3"};
c_lib.addIncludePath(.{.path = "include"}); c_lib.addIncludePath(.{.path = "include"});
exe.addIncludePath(.{.path = "include"}); exe.addIncludePath(.{.path = "include"});
c_lib.linkLibC(); c_lib.linkLibC();
{ // compile glfw from source: { // compile glfw from source:
if(target.getOsTag() == .windows) { if(target.getOsTag() == .windows) {
c_lib.addCSourceFiles(&[_][]const u8 { c_lib.addCSourceFiles(.{.files = &[_][]const u8 {
"lib/glfw/src/win32_init.c", "lib/glfw/src/win32_joystick.c", "lib/glfw/src/win32_monitor.c", "lib/glfw/src/win32_time.c", "lib/glfw/src/win32_thread.c", "lib/glfw/src/win32_window.c", "lib/glfw/src/wgl_context.c", "lib/glfw/src/egl_context.c", "lib/glfw/src/osmesa_context.c", "lib/glfw/src/context.c", "lib/glfw/src/init.c", "lib/glfw/src/input.c", "lib/glfw/src/monitor.c", "lib/glfw/src/vulkan.c", "lib/glfw/src/window.c" "lib/glfw/src/win32_init.c", "lib/glfw/src/win32_joystick.c", "lib/glfw/src/win32_monitor.c", "lib/glfw/src/win32_time.c", "lib/glfw/src/win32_thread.c", "lib/glfw/src/win32_window.c", "lib/glfw/src/wgl_context.c", "lib/glfw/src/egl_context.c", "lib/glfw/src/osmesa_context.c", "lib/glfw/src/context.c", "lib/glfw/src/init.c", "lib/glfw/src/input.c", "lib/glfw/src/monitor.c", "lib/glfw/src/vulkan.c", "lib/glfw/src/window.c"
}, &[_][]const u8{"-g", "-std=c99", "-D_GLFW_WIN32"}); }, .flags = c_flags ++ &[_][]const u8{"-std=c99", "-D_GLFW_WIN32"}});
c_lib.linkSystemLibrary("gdi32"); c_lib.linkSystemLibrary("gdi32");
c_lib.linkSystemLibrary("opengl32"); c_lib.linkSystemLibrary("opengl32");
c_lib.linkSystemLibrary("ws2_32"); c_lib.linkSystemLibrary("ws2_32");
@ -44,9 +45,9 @@ pub fn build(b: *std.build.Builder) !void {
// "lib/glfw/src/linux_joystick.c", "lib/glfw/src/wl_init.c", "lib/glfw/src/wl_monitor.c", "lib/glfw/src/wl_window.c", "lib/glfw/src/posix_time.c", "lib/glfw/src/posix_thread.c", "lib/glfw/src/xkb_unicode.c", "lib/glfw/src/egl_context.c", "lib/glfw/src/osmesa_context.c", "lib/glfw/src/context.c", "lib/glfw/src/init.c", "lib/glfw/src/input.c", "lib/glfw/src/monitor.c", "lib/glfw/src/vulkan.c", "lib/glfw/src/window.c" // "lib/glfw/src/linux_joystick.c", "lib/glfw/src/wl_init.c", "lib/glfw/src/wl_monitor.c", "lib/glfw/src/wl_window.c", "lib/glfw/src/posix_time.c", "lib/glfw/src/posix_thread.c", "lib/glfw/src/xkb_unicode.c", "lib/glfw/src/egl_context.c", "lib/glfw/src/osmesa_context.c", "lib/glfw/src/context.c", "lib/glfw/src/init.c", "lib/glfw/src/input.c", "lib/glfw/src/monitor.c", "lib/glfw/src/vulkan.c", "lib/glfw/src/window.c"
// }, &[_][]const u8{"-g",}); // }, &[_][]const u8{"-g",});
//} else { //} else {
c_lib.addCSourceFiles(&[_][]const u8 { c_lib.addCSourceFiles(.{.files = &[_][]const u8 {
"lib/glfw/src/linux_joystick.c", "lib/glfw/src/x11_init.c", "lib/glfw/src/x11_monitor.c", "lib/glfw/src/x11_window.c", "lib/glfw/src/xkb_unicode.c", "lib/glfw/src/posix_time.c", "lib/glfw/src/posix_thread.c", "lib/glfw/src/glx_context.c", "lib/glfw/src/egl_context.c", "lib/glfw/src/osmesa_context.c", "lib/glfw/src/context.c", "lib/glfw/src/init.c", "lib/glfw/src/input.c", "lib/glfw/src/monitor.c", "lib/glfw/src/vulkan.c", "lib/glfw/src/window.c" "lib/glfw/src/linux_joystick.c", "lib/glfw/src/x11_init.c", "lib/glfw/src/x11_monitor.c", "lib/glfw/src/x11_window.c", "lib/glfw/src/xkb_unicode.c", "lib/glfw/src/posix_time.c", "lib/glfw/src/posix_thread.c", "lib/glfw/src/glx_context.c", "lib/glfw/src/egl_context.c", "lib/glfw/src/osmesa_context.c", "lib/glfw/src/context.c", "lib/glfw/src/init.c", "lib/glfw/src/input.c", "lib/glfw/src/monitor.c", "lib/glfw/src/vulkan.c", "lib/glfw/src/window.c"
}, &[_][]const u8{"-g", "-std=c99", "-D_GLFW_X11"}); }, .flags = c_flags ++ &[_][]const u8{"-std=c99", "-D_GLFW_X11"}});
c_lib.linkSystemLibrary("x11"); c_lib.linkSystemLibrary("x11");
//} //}
c_lib.linkSystemLibrary("GL"); c_lib.linkSystemLibrary("GL");
@ -73,28 +74,28 @@ pub fn build(b: *std.build.Builder) !void {
"src/common/pa_ringbuffer.c", "src/common/pa_ringbuffer.c",
"src/common/pa_stream.c", "src/common/pa_stream.c",
"src/common/pa_trace.c", "src/common/pa_trace.c",
}, &[_][]const u8{"-g", "-O3"}); }, c_flags);
if(target.getOsTag() == .windows) { if(target.getOsTag() == .windows) {
// windows: // windows:
addPackageCSourceFiles(c_lib, portaudio, &[_][]const u8 {"src/os/win/pa_win_coinitialize.c", "src/os/win/pa_win_hostapis.c", "src/os/win/pa_win_util.c", "src/os/win/pa_win_waveformat.c", "src/os/win/pa_win_wdmks_utils.c", "src/os/win/pa_x86_plain_converters.c", }, &[_][]const u8{"-g", "-O3", "-DPA_USE_WASAPI"}); addPackageCSourceFiles(c_lib, portaudio, &[_][]const u8 {"src/os/win/pa_win_coinitialize.c", "src/os/win/pa_win_hostapis.c", "src/os/win/pa_win_util.c", "src/os/win/pa_win_waveformat.c", "src/os/win/pa_win_wdmks_utils.c", "src/os/win/pa_x86_plain_converters.c", }, c_flags ++ &[_][]const u8{"-DPA_USE_WASAPI"});
c_lib.addIncludePath(portaudio.path("src/os/win")); c_lib.addIncludePath(portaudio.path("src/os/win"));
c_lib.linkSystemLibrary("ole32"); c_lib.linkSystemLibrary("ole32");
c_lib.linkSystemLibrary("winmm"); c_lib.linkSystemLibrary("winmm");
c_lib.linkSystemLibrary("uuid"); c_lib.linkSystemLibrary("uuid");
// WASAPI: // WASAPI:
addPackageCSourceFiles(c_lib, portaudio, &[_][]const u8 {"src/hostapi/wasapi/pa_win_wasapi.c"}, &[_][]const u8{"-g", "-O3"}); addPackageCSourceFiles(c_lib, portaudio, &[_][]const u8 {"src/hostapi/wasapi/pa_win_wasapi.c"}, c_flags);
} else if(target.getOsTag() == .linux) { } else if(target.getOsTag() == .linux) {
// unix: // unix:
addPackageCSourceFiles(c_lib, portaudio, &[_][]const u8 {"src/os/unix/pa_unix_hostapis.c", "src/os/unix/pa_unix_util.c"}, &[_][]const u8{"-g", "-O3", "-DPA_USE_ALSA"}); addPackageCSourceFiles(c_lib, portaudio, &[_][]const u8 {"src/os/unix/pa_unix_hostapis.c", "src/os/unix/pa_unix_util.c"}, c_flags ++ &[_][]const u8{"-DPA_USE_ALSA"});
c_lib.addIncludePath(portaudio.path("src/os/unix")); c_lib.addIncludePath(portaudio.path("src/os/unix"));
// ALSA: // ALSA:
addPackageCSourceFiles(c_lib, portaudio, &[_][]const u8 {"src/hostapi/alsa/pa_linux_alsa.c"}, &[_][]const u8{"-g", "-O3"}); addPackageCSourceFiles(c_lib, portaudio, &[_][]const u8 {"src/hostapi/alsa/pa_linux_alsa.c"}, c_flags);
c_lib.linkSystemLibrary("asound"); c_lib.linkSystemLibrary("asound");
} else { } else {
std.log.err("Unsupported target: {}\n", .{ target.getOsTag() }); std.log.err("Unsupported target: {}\n", .{ target.getOsTag() });
} }
} }
c_lib.addCSourceFiles(&[_][]const u8{"lib/glad.c", "lib/stb_image.c", "lib/stb_image_write.c", "lib/stb_vorbis.c"}, &[_][]const u8{"-g", "-O3"}); c_lib.addCSourceFiles(.{.files = &[_][]const u8{"lib/glad.c", "lib/stb_image.c", "lib/stb_image_write.c", "lib/stb_vorbis.c"}, .flags = c_flags});
exe.addAnonymousModule("gui", .{.source_file = .{.path = "src/gui/gui.zig"}}); exe.addAnonymousModule("gui", .{.source_file = .{.path = "src/gui/gui.zig"}});
exe.addAnonymousModule("server", .{.source_file = .{.path = "src/server/server.zig"}}); exe.addAnonymousModule("server", .{.source_file = .{.path = "src/server/server.zig"}});

5
build.zig.zon
View File

@ -1,10 +1,11 @@
.{ .{
.name = "Cubyzig", .name = "Cubyzig",
.version = "0.0.0", .version = "0.0.0",
.paths = .{""},
.dependencies = .{ .dependencies = .{
.mach_freetype = .{ .mach_freetype = .{
.url = "https://pkg.machengine.org/mach-freetype/7dd97f088455fddda6832851082f68670b36c426.tar.gz", .url = "https://pkg.machengine.org/mach-freetype/f152278c6ccc6dcf6dcf4308bbe027a7598ffe63.tar.gz",
.hash = "12209950df2c606a03f5246dce72b3338ffd7314221b20e55df38f8b76676cb9ba13", .hash = "1220e0de43cacb583b8f9efddcbe359398cfca17a39e265b56c8f2a10314eb8f7a5f"
}, },
.portaudio = .{ .portaudio = .{
.url = "https://github.com/PortAudio/portaudio/archive/refs/tags/v19.7.0.tar.gz", .url = "https://github.com/PortAudio/portaudio/archive/refs/tags/v19.7.0.tar.gz",

2
run.bat
View File

@ -1,6 +1,6 @@
@echo off @echo off
set version=zig-windows-x86_64-0.12.0-dev.706+62a0fbdae set version=zig-windows-x86_64-0.12.0-dev.983+78f2ae7f2
if not exist compiler mkdir compiler if not exist compiler mkdir compiler
if not exist compiler\version.txt copy NUL compiler\version.txt >NUL if not exist compiler\version.txt copy NUL compiler\version.txt >NUL

2
run.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
version=zig-linux-x86_64-0.12.0-dev.706+62a0fbdae version=zig-linux-x86_64-0.12.0-dev.983+78f2ae7f2
mkdir -p compiler/zig mkdir -p compiler/zig
touch compiler/version.txt touch compiler/version.txt