getting us compiling on windows

1 files changed, 69 insertions, 70 deletions

diff --git a/xmake.lua b/xmake.lua
index a5e6239..0fc042c 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -1,6 +1,6 @@
 set_project("celeritas")
 set_version("0.1.0")
-set_config("cc", "gcc")
+set_config("cc", "clang")
 
 add_rules("mode.debug", "mode.release") -- we have two modes: debug & release
 
@@ -25,7 +25,7 @@ if is_plat("linux") then
 elseif is_plat("windows") then
     add_defines("CEL_PLATFORM_WINDOWS")
     add_syslinks("user32", "gdi32", "kernel32", "shell32")
-    add_links("pthreadVC2-w64")
+    -- add_links("pthreadVC2-w64")
 elseif is_plat("macosx") then
     add_defines("CEL_PLATFORM_MAC")
     add_frameworks("Cocoa", "IOKit", "CoreVideo", "OpenGL")
@@ -54,11 +54,10 @@ add_requires("local_glfw")
 local core_sources = {
     "deps/glad/src/glad.c",
     "src/*.c",
-    "src/logos/*.c",
+    -- "src/logos/*.c",
     "src/platform/*.c",
     "src/renderer/*.c",
     "src/renderer/backends/*.c",
-    "src/renderer/cleanroom/*.c",
     "src/resources/*.c",
     "src/std/*.c",
     "src/std/containers/*.c",
@@ -96,12 +95,12 @@ target("core_config")
     add_includedirs("deps/stb_image_write", {public = true})
     add_includedirs("deps/stb_truetype", {public = true})
     add_includedirs("src/", {public = true})
-    add_includedirs("src/logos/", {public = true})
+    -- add_includedirs("src/logos/", {public = true})
     add_includedirs("src/maths/", {public = true})
     add_includedirs("src/platform/", {public = true})
     add_includedirs("src/renderer/", {public = true})
     add_includedirs("src/renderer/backends/", {public = true})
-    add_includedirs("src/renderer/cleanroom/", {public = true})
+    -- add_includedirs("src/renderer/cleanroom/", {public = true})
     add_includedirs("src/resources/", {public = true})
     add_includedirs("src/std/", {public = true})
     add_includedirs("src/std/containers", {public = true})
@@ -133,75 +132,75 @@ target("core_shared")
     if is_plat("windows") then
         add_links("msvcrt", "legacy_stdio_definitions") -- for release builds
         add_links("msvcrtd", "legacy_stdio_definitions") -- for debug builds
-        add_links("pthreadVC2-w64")
+        -- add_links("pthreadVC2-w64")
     end
 
 target("main_loop")
     set_kind("binary")
     set_group("examples")
-    add_deps("core_shared")
-    add_files("examples/main_loop/ex_main_loop.c")
-    set_rundir("$(projectdir)")
-
-target("std")
-    set_kind("binary")
-    set_group("examples")
-    add_deps("core_static")
-    add_files("examples/standard_lib/ex_std.c")
-    set_rundir("$(projectdir)")
-
-target("obj")
-    set_kind("binary")
-    set_group("examples")
-    add_deps("core_static")
-    add_files("examples/obj_loading/ex_obj_loading.c")
-    set_rundir("$(projectdir)")
-
-target("input")
-    set_kind("binary")
-    set_group("examples")
-    add_deps("core_static")
-    add_files("examples/input/ex_input.c")
-    set_rundir("$(projectdir)")
-
-target("gltf")
-    set_kind("binary")
-    set_group("examples")
-    add_deps("core_static")
-    add_files("examples/gltf_loading/ex_gltf_loading.c")
-    set_rundir("$(projectdir)")
-
-target("transforms")
-    set_kind("binary")
-    set_group("examples")
-    add_deps("core_shared")
-    add_files("examples/transforms/ex_transforms.c")
-    set_rundir("$(projectdir)")
-
-target("animation")
-    set_kind("binary")
-    set_group("examples")
-    add_deps("core_shared")
-    add_files("examples/property_animation/ex_property_animation.c")
-    set_rundir("$(projectdir)")
-
-target("skinned")
-    set_kind("binary")
-    set_group("examples")
-    add_deps("core_shared")
-    add_files("examples/skinned_animation/ex_skinned_animation.c")
-    set_rundir("$(projectdir)")
-
-target("input")
-    set_kind("binary")
-    set_group("examples")
     add_deps("core_static")
-    add_files("examples/input/ex_input.c")
+    add_files("examples/main_loop/ex_main_loop.c")
     set_rundir("$(projectdir)")
 
-target("demo")
-    set_kind("binary")
-    set_group("examples")
-    add_deps("core_static")
-    add_files("examples/demo/demo.c")
-    set_rundir("$(projectdir)")
+-- target("std")
+--     set_kind("binary")
+--     set_group("examples")
+--     add_deps("core_static")
+--     add_files("examples/standard_lib/ex_std.c")
+--     set_rundir("$(projectdir)")
+
+-- target("obj")
+--     set_kind("binary")
+--     set_group("examples")
+--     add_deps("core_static")
+--     add_files("examples/obj_loading/ex_obj_loading.c")
+--     set_rundir("$(projectdir)")
+
+-- target("input")
+--     set_kind("binary")
+--     set_group("examples")
+--     add_deps("core_static")
+--     add_files("examples/input/ex_input.c")
+--     set_rundir("$(projectdir)")
+
+-- target("gltf")
+--     set_kind("binary")
+--     set_group("examples")
+--     add_deps("core_static")
+--     add_files("examples/gltf_loading/ex_gltf_loading.c")
+--     set_rundir("$(projectdir)")
+
+-- target("transforms")
+--     set_kind("binary")
+--     set_group("examples")
+--     add_deps("core_shared")
+--     add_files("examples/transforms/ex_transforms.c")
+--     set_rundir("$(projectdir)")
+
+-- target("animation")
+--     set_kind("binary")
+--     set_group("examples")
+--     add_deps("core_shared")
+--     add_files("examples/property_animation/ex_property_animation.c")
+--     set_rundir("$(projectdir)")
+
+-- target("skinned")
+--     set_kind("binary")
+--     set_group("examples")
+--     add_deps("core_shared")
+--     add_files("examples/skinned_animation/ex_skinned_animation.c")
+--     set_rundir("$(projectdir)")
+
+-- target("input")
+--     set_kind("binary")
+--     set_group("examples")
+--     add_deps("core_static")
+--     add_files("examples/input/ex_input.c")
+--     set_rundir("$(projectdir)")
+
+-- target("demo")
+--     set_kind("binary")
+--     set_group("examples")
+--     add_deps("core_static")
+--     add_files("examples/demo/demo.c")
+--     set_rundir("$(projectdir)")