diff --git a/.gitignore b/.gitignore index 2d36d7e..0beb4bb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ Build/ Nocheckin/ feely_pona_build.exe +feely_pona_build feely_pona_version.txt Tools/emsdk diff --git a/External/tely b/External/tely index f6c96fb..743d968 160000 --- a/External/tely +++ b/External/tely @@ -1 +1 @@ -Subproject commit f6c96fb65331e2829a43e0375cb8fc1bd0969c06 +Subproject commit 743d9684bc7675b3059b8f4049abd5c27b2f646c diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..9a9cc3b --- /dev/null +++ b/build.sh @@ -0,0 +1,21 @@ +#!/bin/bash +set -e + +script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +build_dir=${script_dir}/Build +code_dir=${script_dir} + +# Bootstrap a version +git show -s --date=format:%Y-%m-%d --format=%cd HEAD> feely_pona_version.txt +git rev-parse --short=8 HEAD>> feely_pona_version.txt +git rev-list --count HEAD>> feely_pona_version.txt + +# Bootstrap the build program +mkdir --parents ${build_dir} +pushd ${build_dir} +g++ -g -Wall -o feely_pona_build ${code_dir}/feely_pona_build.cpp -lm +cp --force feely_pona_build ${code_dir} +popd + +# Run the build program +# ${code_dir}\feely_pona_build.exe $@ || exit /B 1 diff --git a/feely_pona_build.cpp b/feely_pona_build.cpp index 1fc4234..19ea981 100644 --- a/feely_pona_build.cpp +++ b/feely_pona_build.cpp @@ -88,7 +88,7 @@ int main(int argc, char const **argv) bool dry_run = false; bool target_web = false; bool dev_fast_build = false; - for (Dqn_usize arg_index = 1; arg_index < argc; arg_index++) { + for (Dqn_isize arg_index = 1; arg_index < argc; arg_index++) { Dqn_Str8 arg = Dqn_Str8_InitCStr8(argv[arg_index]); if (arg == DQN_STR8("--help")) { PRINT_HELP; @@ -507,7 +507,6 @@ int main(int argc, char const **argv) { Dqn_Str8 base_file = sokol_audio_source_code_file; - Dqn_Str8 file_stem = Dqn_Str8_FileNameNoExtension(base_file); // NOTE: Append "emscripten" suffix to the object files Dqn_CPPBuildCompileFile build_file = {};