diff --git a/samples/fluid/build.sh b/samples/fluid/build.sh index 513a2e0..af63959 100755 --- a/samples/fluid/build.sh +++ b/samples/fluid/build.sh @@ -14,7 +14,6 @@ fi ORCA_DIR=../.. STDLIB_DIR=../../cstdlib ORCA_SDK_DIR=../../sdk -MILEPOST_DIR=../../milepost python3 ../../scripts/embed_text_files.py --prefix=glsl_ --output src/glsl_shaders.h src/shaders/*.glsl @@ -29,7 +28,8 @@ wasmFlags="--target=wasm32 \ -D__ORCA__ \ -I $STDLIB_DIR/include \ -I $ORCA_SDK_DIR \ - -I $ORCA_DIR/ext -I $MILEPOST_DIR -I $MILEPOST_DIR/src" + -I $ORCA_DIR/ext \ + -I $ORCA_DIR/src" $CLANG $wasmFlags -o ./module.wasm ../../sdk/orca.c ../../cstdlib/src/*.c src/main.c diff --git a/samples/glesTriangle/build.sh b/samples/glesTriangle/build.sh index b39157d..6c1ab35 100755 --- a/samples/glesTriangle/build.sh +++ b/samples/glesTriangle/build.sh @@ -14,7 +14,6 @@ fi ORCA_DIR=../.. STDLIB_DIR=../../cstdlib ORCA_SDK_DIR=../../sdk -MILEPOST_DIR=../../milepost wasmFlags="--target=wasm32 \ --no-standard-libraries \ @@ -28,7 +27,7 @@ wasmFlags="--target=wasm32 \ -I $STDLIB_DIR/include \ -I $ORCA_SDK_DIR \ -I $ORCA_DIR/ext \ - -I $MILEPOST_DIR -I $MILEPOST_DIR/src" + -I $ORCA_DIR/src" $CLANG $wasmFlags -o ./module.wasm ../../sdk/orca.c ../../cstdlib/src/*.c src/main.c diff --git a/samples/pong/build.sh b/samples/pong/build.sh index d5ad35f..bb09a10 100755 --- a/samples/pong/build.sh +++ b/samples/pong/build.sh @@ -14,7 +14,6 @@ fi ORCA_DIR=../.. STDLIB_DIR=../../cstdlib ORCA_SDK_DIR=../../sdk -MILEPOST_DIR=../../milepost wasmFlags="--target=wasm32 \ --no-standard-libraries \ @@ -28,7 +27,7 @@ wasmFlags="--target=wasm32 \ -I $STDLIB_DIR/include \ -I $ORCA_DIR/ext \ -I $ORCA_SDK_DIR \ - -I $MILEPOST_DIR/ext -I $MILEPOST_DIR -I $MILEPOST_DIR/src" + -I $ORCA_DIR/src" $CLANG $wasmFlags -o ./module.wasm ../../sdk/orca.c ../../cstdlib/src/*.c src/main.c diff --git a/samples/ui/build.sh b/samples/ui/build.sh index 8706156..9ce6242 100755 --- a/samples/ui/build.sh +++ b/samples/ui/build.sh @@ -12,6 +12,8 @@ else fi ORCA_DIR=../.. +STDLIB_DIR=../../cstdlib +ORCA_SDK_DIR=../../sdk wasmFlags="--target=wasm32 \ --no-standard-libraries \ @@ -23,7 +25,10 @@ wasmFlags="--target=wasm32 \ -mbulk-memory \ -D__ORCA__ \ -I $ORCA_DIR/ext \ - -isystem ../../cstdlib/include -I ../../sdk -I../../milepost/ext -I ../../milepost -I ../../milepost/src" + -I $STDLIB_DIR/include \ + -I $ORCA_DIR/ext \ + -I $ORCA_SDK_DIR \ + -I $ORCA_DIR/src" $CLANG $wasmFlags -o ./module.wasm ../../sdk/orca.c ../../cstdlib/src/*.c src/main.c diff --git a/scripts/dev.py b/scripts/dev.py index 17bb897..202c518 100644 --- a/scripts/dev.py +++ b/scripts/dev.py @@ -67,7 +67,6 @@ def build_runtime(args): def clean(args): yeet("build") - yeet("milepost/build") yeet("ext/angle") yeet("scripts/files") yeet("scripts/__pycache__") @@ -75,50 +74,47 @@ def clean(args): def build_milepost(target, release): print("Building milepost...") - with pushd("milepost"): - os.makedirs("../build/bin", exist_ok=True) - os.makedirs("../build/lib", exist_ok=True) - if target == "lib": - if platform.system() == "Windows": - build_milepost_lib_win(release) - elif platform.system() == "Darwin": - build_milepost_lib_mac(release) - else: - log_error(f"can't build milepost for unknown platform '{platform.system()}'") - exit(1) - elif target == "test": - with pushd("examples/test_app"): - # TODO? - subprocess.run(["./build.sh"]) - elif target == "clean": - removeall("bin") + os.makedirs("build/bin", exist_ok=True) + os.makedirs("build/lib", exist_ok=True) + + if target == "lib": + if platform.system() == "Windows": + build_milepost_lib_win(release) + elif platform.system() == "Darwin": + build_milepost_lib_mac(release) else: - log_error(f"unrecognized milepost target '{target}'") + log_error(f"can't build milepost for unknown platform '{platform.system()}'") exit(1) + elif target == "test": + with pushd("examples/test_app"): + # TODO? + subprocess.run(["./build.sh"]) + elif target == "clean": + removeall("bin") + else: + log_error(f"unrecognized milepost target '{target}'") + exit(1) def build_milepost_lib_win(release): - embed_text_files("src\\glsl_shaders.h", "glsl_", [ - "src\\glsl_shaders\\common.glsl", - "src\\glsl_shaders\\blit_vertex.glsl", - "src\\glsl_shaders\\blit_fragment.glsl", - "src\\glsl_shaders\\path_setup.glsl", - "src\\glsl_shaders\\segment_setup.glsl", - "src\\glsl_shaders\\backprop.glsl", - "src\\glsl_shaders\\merge.glsl", - "src\\glsl_shaders\\raster.glsl", - "src\\glsl_shaders\\balance_workgroups.glsl", + embed_text_files("src\\graphics\\glsl_shaders.h", "glsl_", [ + "src\\graphics\\glsl_shaders\\common.glsl", + "src\\graphics\\glsl_shaders\\blit_vertex.glsl", + "src\\graphics\\glsl_shaders\\blit_fragment.glsl", + "src\\graphics\\glsl_shaders\\path_setup.glsl", + "src\\graphics\\glsl_shaders\\segment_setup.glsl", + "src\\graphics\\glsl_shaders\\backprop.glsl", + "src\\graphics\\glsl_shaders\\merge.glsl", + "src\\graphics\\glsl_shaders\\raster.glsl", + "src\\graphics\\glsl_shaders\\balance_workgroups.glsl", ]) includes = [ "/I", "src", - "/I", "src/util", - "/I", "src/platform", "/I", "ext", - "/I", "../ext", - "/I", "../ext/angle/include", + "/I", "ext/angle/include", ] libs = [ "user32.lib", @@ -131,7 +127,7 @@ def build_milepost_lib_win(release): "ole32.lib", "shell32.lib", "shlwapi.lib", - "/LIBPATH:../ext/angle/bin", + "/LIBPATH:ext/angle/bin", "libEGL.dll.lib", "libGLESv2.dll.lib", "/DELAYLOAD:libEGL.dll", @@ -148,8 +144,8 @@ def build_milepost_lib_win(release): "/LD", "/link", "/MANIFEST:EMBED", "/MANIFESTINPUT:src/win32_manifest.xml", *libs, - "/OUT:../build/bin/milepost.dll", - "/IMPLIB:../build/bin/milepost.dll.lib", + "/OUT:build/bin/milepost.dll", + "/IMPLIB:build/bin/milepost.dll.lib", ], check=True) @@ -160,20 +156,20 @@ def build_milepost_lib_mac(release): cflags = ["-std=c11"] debug_flags = ["-O3"] if release else ["-g", "-DDEBUG", "-DLOG_COMPILE_DEBUG"] ldflags = [f"-L{sdk_dir}/usr/lib", f"-F{sdk_dir}/System/Library/Frameworks/"] - includes = ["-Isrc", "-Isrc/util", "-Isrc/platform", "-Iext", "-I../ext", "-I../ext/angle/include"] + includes = ["-Isrc", "-Isrc/util", "-Isrc/platform", "-Iext", "-Iext/angle/include"] # compile metal shader subprocess.run([ "xcrun", "-sdk", "macosx", "metal", # TODO: shaderFlagParam "-fno-fast-math", "-c", - "-o", "../build/mtl_renderer.air", + "-o", "build/mtl_renderer.air", "src/graphics/mtl_renderer.metal", ], check=True) subprocess.run([ "xcrun", "-sdk", "macosx", "metallib", - "-o", "../build/bin/mtl_renderer.metallib", - "../build/mtl_renderer.air", + "-o", "build/bin/mtl_renderer.metallib", + "build/mtl_renderer.air", ], check=True) # compile milepost. We use one compilation unit for all C code, and one @@ -181,14 +177,14 @@ def build_milepost_lib_mac(release): subprocess.run([ "clang", *debug_flags, "-c", - "-o", "../build/milepost_c.o", + "-o", "build/milepost_c.o", *cflags, *flags, *includes, "src/milepost.c" ], check=True) subprocess.run([ "clang", *debug_flags, "-c", - "-o", "../build/milepost_objc.o", + "-o", "build/milepost_objc.o", *flags, *includes, "src/milepost.m" ], check=True) @@ -197,9 +193,9 @@ def build_milepost_lib_mac(release): subprocess.run([ "ld", *ldflags, "-dylib", - "-o", "../build/bin/libmilepost.dylib", - "../build/milepost_c.o", "../build/milepost_objc.o", - "-L../ext/angle/bin", "-lc", + "-o", "build/bin/libmilepost.dylib", + "build/milepost_c.o", "build/milepost_objc.o", + "-Lext/angle/bin", "-lc", "-framework", "Carbon", "-framework", "Cocoa", "-framework", "Metal", "-framework", "QuartzCore", "-weak-lEGL", "-weak-lGLESv2", ], check=True) @@ -208,12 +204,12 @@ def build_milepost_lib_mac(release): subprocess.run([ "install_name_tool", "-change", "./libEGL.dylib", "@rpath/libEGL.dylib", - "../build/bin/libmilepost.dylib", + "build/bin/libmilepost.dylib", ], check=True) subprocess.run([ "install_name_tool", "-change", "./libGLESv2.dylib", "@rpath/libGLESv2.dylib", - "../build/bin/libmilepost.dylib", + "build/bin/libmilepost.dylib", ], check=True) # add executable path to rpath. Client executable can still add its own @@ -221,7 +217,7 @@ def build_milepost_lib_mac(release): subprocess.run([ "install_name_tool", "-id", "@rpath/libmilepost.dylib", - "../build/bin/libmilepost.dylib", + "build/bin/libmilepost.dylib", ], check=True) diff --git a/milepost/src/app/mp_app.c b/src/app/mp_app.c similarity index 100% rename from milepost/src/app/mp_app.c rename to src/app/mp_app.c diff --git a/milepost/src/app/mp_app.h b/src/app/mp_app.h similarity index 100% rename from milepost/src/app/mp_app.h rename to src/app/mp_app.h diff --git a/milepost/src/app/mp_app_internal.h b/src/app/mp_app_internal.h similarity index 100% rename from milepost/src/app/mp_app_internal.h rename to src/app/mp_app_internal.h diff --git a/milepost/src/app/osx_app.h b/src/app/osx_app.h similarity index 100% rename from milepost/src/app/osx_app.h rename to src/app/osx_app.h diff --git a/milepost/src/app/osx_app.m b/src/app/osx_app.m similarity index 100% rename from milepost/src/app/osx_app.m rename to src/app/osx_app.m diff --git a/milepost/src/app/win32_app.c b/src/app/win32_app.c similarity index 100% rename from milepost/src/app/win32_app.c rename to src/app/win32_app.c diff --git a/milepost/src/app/win32_app.h b/src/app/win32_app.h similarity index 100% rename from milepost/src/app/win32_app.h rename to src/app/win32_app.h diff --git a/milepost/src/app/win32_manifest.xml b/src/app/win32_manifest.xml similarity index 100% rename from milepost/src/app/win32_manifest.xml rename to src/app/win32_manifest.xml diff --git a/milepost/src/graphics/egl_surface.c b/src/graphics/egl_surface.c similarity index 100% rename from milepost/src/graphics/egl_surface.c rename to src/graphics/egl_surface.c diff --git a/milepost/src/graphics/egl_surface.h b/src/graphics/egl_surface.h similarity index 100% rename from milepost/src/graphics/egl_surface.h rename to src/graphics/egl_surface.h diff --git a/milepost/src/graphics/gl_api.h b/src/graphics/gl_api.h similarity index 100% rename from milepost/src/graphics/gl_api.h rename to src/graphics/gl_api.h diff --git a/milepost/src/graphics/gl_canvas.c b/src/graphics/gl_canvas.c similarity index 100% rename from milepost/src/graphics/gl_canvas.c rename to src/graphics/gl_canvas.c diff --git a/milepost/src/graphics/gl_loader.c b/src/graphics/gl_loader.c similarity index 100% rename from milepost/src/graphics/gl_loader.c rename to src/graphics/gl_loader.c diff --git a/milepost/src/graphics/gl_loader.h b/src/graphics/gl_loader.h similarity index 100% rename from milepost/src/graphics/gl_loader.h rename to src/graphics/gl_loader.h diff --git a/milepost/src/graphics/glsl_shaders/backprop.glsl b/src/graphics/glsl_shaders/backprop.glsl similarity index 100% rename from milepost/src/graphics/glsl_shaders/backprop.glsl rename to src/graphics/glsl_shaders/backprop.glsl diff --git a/milepost/src/graphics/glsl_shaders/balance_workgroups.glsl b/src/graphics/glsl_shaders/balance_workgroups.glsl similarity index 100% rename from milepost/src/graphics/glsl_shaders/balance_workgroups.glsl rename to src/graphics/glsl_shaders/balance_workgroups.glsl diff --git a/milepost/src/graphics/glsl_shaders/blit_fragment.glsl b/src/graphics/glsl_shaders/blit_fragment.glsl similarity index 100% rename from milepost/src/graphics/glsl_shaders/blit_fragment.glsl rename to src/graphics/glsl_shaders/blit_fragment.glsl diff --git a/milepost/src/graphics/glsl_shaders/blit_vertex.glsl b/src/graphics/glsl_shaders/blit_vertex.glsl similarity index 100% rename from milepost/src/graphics/glsl_shaders/blit_vertex.glsl rename to src/graphics/glsl_shaders/blit_vertex.glsl diff --git a/milepost/src/graphics/glsl_shaders/common.glsl b/src/graphics/glsl_shaders/common.glsl similarity index 100% rename from milepost/src/graphics/glsl_shaders/common.glsl rename to src/graphics/glsl_shaders/common.glsl diff --git a/milepost/src/graphics/glsl_shaders/merge.glsl b/src/graphics/glsl_shaders/merge.glsl similarity index 100% rename from milepost/src/graphics/glsl_shaders/merge.glsl rename to src/graphics/glsl_shaders/merge.glsl diff --git a/milepost/src/graphics/glsl_shaders/path_setup.glsl b/src/graphics/glsl_shaders/path_setup.glsl similarity index 100% rename from milepost/src/graphics/glsl_shaders/path_setup.glsl rename to src/graphics/glsl_shaders/path_setup.glsl diff --git a/milepost/src/graphics/glsl_shaders/raster.glsl b/src/graphics/glsl_shaders/raster.glsl similarity index 100% rename from milepost/src/graphics/glsl_shaders/raster.glsl rename to src/graphics/glsl_shaders/raster.glsl diff --git a/milepost/src/graphics/glsl_shaders/segment_setup.glsl b/src/graphics/glsl_shaders/segment_setup.glsl similarity index 100% rename from milepost/src/graphics/glsl_shaders/segment_setup.glsl rename to src/graphics/glsl_shaders/segment_setup.glsl diff --git a/milepost/src/graphics/graphics.h b/src/graphics/graphics.h similarity index 100% rename from milepost/src/graphics/graphics.h rename to src/graphics/graphics.h diff --git a/milepost/src/graphics/graphics_common.c b/src/graphics/graphics_common.c similarity index 100% rename from milepost/src/graphics/graphics_common.c rename to src/graphics/graphics_common.c diff --git a/milepost/src/graphics/graphics_common.h b/src/graphics/graphics_common.h similarity index 100% rename from milepost/src/graphics/graphics_common.h rename to src/graphics/graphics_common.h diff --git a/milepost/src/graphics/graphics_surface.c b/src/graphics/graphics_surface.c similarity index 100% rename from milepost/src/graphics/graphics_surface.c rename to src/graphics/graphics_surface.c diff --git a/milepost/src/graphics/graphics_surface.h b/src/graphics/graphics_surface.h similarity index 100% rename from milepost/src/graphics/graphics_surface.h rename to src/graphics/graphics_surface.h diff --git a/milepost/src/graphics/mtl_renderer.h b/src/graphics/mtl_renderer.h similarity index 100% rename from milepost/src/graphics/mtl_renderer.h rename to src/graphics/mtl_renderer.h diff --git a/milepost/src/graphics/mtl_renderer.m b/src/graphics/mtl_renderer.m similarity index 100% rename from milepost/src/graphics/mtl_renderer.m rename to src/graphics/mtl_renderer.m diff --git a/milepost/src/graphics/mtl_renderer.metal b/src/graphics/mtl_renderer.metal similarity index 100% rename from milepost/src/graphics/mtl_renderer.metal rename to src/graphics/mtl_renderer.metal diff --git a/milepost/src/graphics/mtl_surface.h b/src/graphics/mtl_surface.h similarity index 100% rename from milepost/src/graphics/mtl_surface.h rename to src/graphics/mtl_surface.h diff --git a/milepost/src/graphics/mtl_surface.m b/src/graphics/mtl_surface.m similarity index 100% rename from milepost/src/graphics/mtl_surface.m rename to src/graphics/mtl_surface.m diff --git a/milepost/src/graphics/wgl_surface.c b/src/graphics/wgl_surface.c similarity index 100% rename from milepost/src/graphics/wgl_surface.c rename to src/graphics/wgl_surface.c diff --git a/milepost/src/graphics/wgl_surface.h b/src/graphics/wgl_surface.h similarity index 100% rename from milepost/src/graphics/wgl_surface.h rename to src/graphics/wgl_surface.h diff --git a/milepost/src/milepost.c b/src/milepost.c similarity index 100% rename from milepost/src/milepost.c rename to src/milepost.c diff --git a/milepost/src/milepost.h b/src/milepost.h similarity index 100% rename from milepost/src/milepost.h rename to src/milepost.h diff --git a/milepost/src/milepost.m b/src/milepost.m similarity index 100% rename from milepost/src/milepost.m rename to src/milepost.m diff --git a/milepost/src/platform/linux_clock.c b/src/platform/linux_clock.c similarity index 100% rename from milepost/src/platform/linux_clock.c rename to src/platform/linux_clock.c diff --git a/milepost/src/platform/orca_clock.c b/src/platform/orca_clock.c similarity index 100% rename from milepost/src/platform/orca_clock.c rename to src/platform/orca_clock.c diff --git a/milepost/src/platform/orca_log.c b/src/platform/orca_log.c similarity index 100% rename from milepost/src/platform/orca_log.c rename to src/platform/orca_log.c diff --git a/milepost/src/platform/orca_malloc.c b/src/platform/orca_malloc.c similarity index 100% rename from milepost/src/platform/orca_malloc.c rename to src/platform/orca_malloc.c diff --git a/milepost/src/platform/orca_memory.c b/src/platform/orca_memory.c similarity index 100% rename from milepost/src/platform/orca_memory.c rename to src/platform/orca_memory.c diff --git a/milepost/src/platform/orca_strings.c b/src/platform/orca_strings.c similarity index 100% rename from milepost/src/platform/orca_strings.c rename to src/platform/orca_strings.c diff --git a/milepost/src/platform/osx_clock.c b/src/platform/osx_clock.c similarity index 100% rename from milepost/src/platform/osx_clock.c rename to src/platform/osx_clock.c diff --git a/milepost/src/platform/osx_path.m b/src/platform/osx_path.m similarity index 100% rename from milepost/src/platform/osx_path.m rename to src/platform/osx_path.m diff --git a/milepost/src/platform/platform.h b/src/platform/platform.h similarity index 100% rename from milepost/src/platform/platform.h rename to src/platform/platform.h diff --git a/milepost/src/platform/platform_assert.h b/src/platform/platform_assert.h similarity index 100% rename from milepost/src/platform/platform_assert.h rename to src/platform/platform_assert.h diff --git a/milepost/src/platform/platform_clock.h b/src/platform/platform_clock.h similarity index 100% rename from milepost/src/platform/platform_clock.h rename to src/platform/platform_clock.h diff --git a/milepost/src/platform/platform_io.h b/src/platform/platform_io.h similarity index 100% rename from milepost/src/platform/platform_io.h rename to src/platform/platform_io.h diff --git a/milepost/src/platform/platform_io_common.c b/src/platform/platform_io_common.c similarity index 100% rename from milepost/src/platform/platform_io_common.c rename to src/platform/platform_io_common.c diff --git a/milepost/src/platform/platform_io_internal.c b/src/platform/platform_io_internal.c similarity index 100% rename from milepost/src/platform/platform_io_internal.c rename to src/platform/platform_io_internal.c diff --git a/milepost/src/platform/platform_io_internal.h b/src/platform/platform_io_internal.h similarity index 100% rename from milepost/src/platform/platform_io_internal.h rename to src/platform/platform_io_internal.h diff --git a/milepost/src/platform/platform_log.c b/src/platform/platform_log.c similarity index 100% rename from milepost/src/platform/platform_log.c rename to src/platform/platform_log.c diff --git a/milepost/src/platform/platform_log.h b/src/platform/platform_log.h similarity index 100% rename from milepost/src/platform/platform_log.h rename to src/platform/platform_log.h diff --git a/milepost/src/platform/platform_math.h b/src/platform/platform_math.h similarity index 100% rename from milepost/src/platform/platform_math.h rename to src/platform/platform_math.h diff --git a/milepost/src/platform/platform_memory.h b/src/platform/platform_memory.h similarity index 100% rename from milepost/src/platform/platform_memory.h rename to src/platform/platform_memory.h diff --git a/milepost/src/platform/platform_path.c b/src/platform/platform_path.c similarity index 100% rename from milepost/src/platform/platform_path.c rename to src/platform/platform_path.c diff --git a/milepost/src/platform/platform_path.h b/src/platform/platform_path.h similarity index 100% rename from milepost/src/platform/platform_path.h rename to src/platform/platform_path.h diff --git a/milepost/src/platform/platform_rng.h b/src/platform/platform_rng.h similarity index 100% rename from milepost/src/platform/platform_rng.h rename to src/platform/platform_rng.h diff --git a/milepost/src/platform/platform_socket.h b/src/platform/platform_socket.h similarity index 100% rename from milepost/src/platform/platform_socket.h rename to src/platform/platform_socket.h diff --git a/milepost/src/platform/platform_strings.h b/src/platform/platform_strings.h similarity index 100% rename from milepost/src/platform/platform_strings.h rename to src/platform/platform_strings.h diff --git a/milepost/src/platform/platform_thread.h b/src/platform/platform_thread.h similarity index 100% rename from milepost/src/platform/platform_thread.h rename to src/platform/platform_thread.h diff --git a/milepost/src/platform/platform_varg.h b/src/platform/platform_varg.h similarity index 100% rename from milepost/src/platform/platform_varg.h rename to src/platform/platform_varg.h diff --git a/milepost/src/platform/posix_io.c b/src/platform/posix_io.c similarity index 100% rename from milepost/src/platform/posix_io.c rename to src/platform/posix_io.c diff --git a/milepost/src/platform/posix_socket.c b/src/platform/posix_socket.c similarity index 100% rename from milepost/src/platform/posix_socket.c rename to src/platform/posix_socket.c diff --git a/milepost/src/platform/posix_thread.c b/src/platform/posix_thread.c similarity index 100% rename from milepost/src/platform/posix_thread.c rename to src/platform/posix_thread.c diff --git a/milepost/src/platform/std_log.c b/src/platform/std_log.c similarity index 100% rename from milepost/src/platform/std_log.c rename to src/platform/std_log.c diff --git a/milepost/src/platform/unix_memory.c b/src/platform/unix_memory.c similarity index 100% rename from milepost/src/platform/unix_memory.c rename to src/platform/unix_memory.c diff --git a/milepost/src/platform/unix_rng.c b/src/platform/unix_rng.c similarity index 100% rename from milepost/src/platform/unix_rng.c rename to src/platform/unix_rng.c diff --git a/milepost/src/platform/win32_clock.c b/src/platform/win32_clock.c similarity index 100% rename from milepost/src/platform/win32_clock.c rename to src/platform/win32_clock.c diff --git a/milepost/src/platform/win32_io.c b/src/platform/win32_io.c similarity index 100% rename from milepost/src/platform/win32_io.c rename to src/platform/win32_io.c diff --git a/milepost/src/platform/win32_memory.c b/src/platform/win32_memory.c similarity index 100% rename from milepost/src/platform/win32_memory.c rename to src/platform/win32_memory.c diff --git a/milepost/src/platform/win32_path.c b/src/platform/win32_path.c similarity index 100% rename from milepost/src/platform/win32_path.c rename to src/platform/win32_path.c diff --git a/milepost/src/platform/win32_string_helpers.c b/src/platform/win32_string_helpers.c similarity index 100% rename from milepost/src/platform/win32_string_helpers.c rename to src/platform/win32_string_helpers.c diff --git a/milepost/src/platform/win32_string_helpers.h b/src/platform/win32_string_helpers.h similarity index 100% rename from milepost/src/platform/win32_string_helpers.h rename to src/platform/win32_string_helpers.h diff --git a/milepost/src/platform/win32_thread.c b/src/platform/win32_thread.c similarity index 100% rename from milepost/src/platform/win32_thread.c rename to src/platform/win32_thread.c diff --git a/milepost/src/ui/input_state.c b/src/ui/input_state.c similarity index 100% rename from milepost/src/ui/input_state.c rename to src/ui/input_state.c diff --git a/milepost/src/ui/input_state.h b/src/ui/input_state.h similarity index 100% rename from milepost/src/ui/input_state.h rename to src/ui/input_state.h diff --git a/milepost/src/ui/ui.c b/src/ui/ui.c similarity index 100% rename from milepost/src/ui/ui.c rename to src/ui/ui.c diff --git a/milepost/src/ui/ui.h b/src/ui/ui.h similarity index 100% rename from milepost/src/ui/ui.h rename to src/ui/ui.h diff --git a/milepost/src/util/atomic.h b/src/util/atomic.h similarity index 100% rename from milepost/src/util/atomic.h rename to src/util/atomic.h diff --git a/milepost/src/util/hash.c b/src/util/hash.c similarity index 100% rename from milepost/src/util/hash.c rename to src/util/hash.c diff --git a/milepost/src/util/hash.h b/src/util/hash.h similarity index 100% rename from milepost/src/util/hash.h rename to src/util/hash.h diff --git a/milepost/src/util/lists.h b/src/util/lists.h similarity index 100% rename from milepost/src/util/lists.h rename to src/util/lists.h diff --git a/milepost/src/util/macro_helpers.h b/src/util/macro_helpers.h similarity index 100% rename from milepost/src/util/macro_helpers.h rename to src/util/macro_helpers.h diff --git a/milepost/src/util/memory.c b/src/util/memory.c similarity index 100% rename from milepost/src/util/memory.c rename to src/util/memory.c diff --git a/milepost/src/util/memory.h b/src/util/memory.h similarity index 100% rename from milepost/src/util/memory.h rename to src/util/memory.h diff --git a/milepost/src/util/ringbuffer.c b/src/util/ringbuffer.c similarity index 100% rename from milepost/src/util/ringbuffer.c rename to src/util/ringbuffer.c diff --git a/milepost/src/util/ringbuffer.h b/src/util/ringbuffer.h similarity index 100% rename from milepost/src/util/ringbuffer.h rename to src/util/ringbuffer.h diff --git a/milepost/src/util/strings.c b/src/util/strings.c similarity index 100% rename from milepost/src/util/strings.c rename to src/util/strings.c diff --git a/milepost/src/util/strings.h b/src/util/strings.h similarity index 100% rename from milepost/src/util/strings.h rename to src/util/strings.h diff --git a/milepost/src/util/typedefs.h b/src/util/typedefs.h similarity index 100% rename from milepost/src/util/typedefs.h rename to src/util/typedefs.h diff --git a/milepost/src/util/utf8.c b/src/util/utf8.c similarity index 100% rename from milepost/src/util/utf8.c rename to src/util/utf8.c diff --git a/milepost/src/util/utf8.h b/src/util/utf8.h similarity index 100% rename from milepost/src/util/utf8.h rename to src/util/utf8.h