Updated build scripts to use common include flags

build_new/config/build-config.sh

@@ -26,9 +26,12 @@ SCRIPTS_DIR="$PROJECT_ROOT/build_new/scripts"
 HELPERS_DIR="$PROJECT_ROOT/build_new/helpers"
 
 # Include directories
-INCLUDES=(
+# TODO: this isn't actually being used - it should be
-    "$CUSTOM_DIR"
+FCODER_INCLUDES=(
-    "$FOREIGN_DIR/freetype2"
+    "-I$CUSTOM_DIR"
+    "-I$CUSTOM_DIR/generated"
+#   "-I$FOREIGN_DIR/freetype2"
+    "-I$FOREIGN_DIR/tree-sitter/lib/include"
 )
 
 # =============================================================================

build_new/scripts/build-linux.sh

@@ -111,24 +111,18 @@ build_core_engine() {
         "-DFRED_INTERNAL"
     )
 
-    # Include directories for custom layer
-    local include_flags=(
-        "-I$CUSTOM_DIR"
-        "-I$CUSTOM_DIR/generated"
-    )
-
     print_info "Compiling core application library..."
     print_info "Input: $app_target"
     print_info "Output: $output_lib"
 
     # Compile core application shared library
     if [[ "${BUILD_VERBOSE:-}" == "1" ]]; then
-        echo "Executing: $CXX ${build_flags[*]} ${include_flags[*]} -o $output_lib $app_target ${LINK_LIBS[*]}"
+        echo "Executing: $CXX ${build_flags[*]} ${FCODER_INCLUDES[*]} -o $output_lib $app_target ${LINK_LIBS[*]}"
     fi
 
     $CXX \
         "${build_flags[@]}" \
-        "${include_flags[@]}" \
+        "${FCODER_INCLUDES[@]}" \
         -o "$output_lib" \
         "$app_target" \
         "${LINK_LIBS[@]}"
@@ -185,9 +179,7 @@ build_custom_layer() {
     local preprocessed_file="$temp_dir/4coder_default_bindings.i"
 
     $CXX \
-        -I"$CODE_DIR" \
+        "${FCODER_INCLUDES[@]}" \
-        -I"$CUSTOM_DIR" \
-        -I"$CUSTOM_DIR/generated" \
         -DMETA_PASS \
         -E \
         "$custom_target" \
@@ -202,9 +194,7 @@ build_custom_layer() {
 
     $CXX \
         "${COMPILE_FLAGS[@]}" \
-        -I"$CODE_DIR" \
+        "${FCODER_INCLUDES[@]}" \
-        -I"$CUSTOM_DIR" \
-        -I"$CUSTOM_DIR/generated" \
         -o "$metadata_generator" \
         "$metadata_source"
 
@@ -230,8 +220,7 @@ build_custom_layer() {
         "${COMPILE_FLAGS[@]}"
         "-shared"
         "-fPIC"
-        "-I$CUSTOM_DIR"
+        "${FCODER_INCLUDES[@]}"
-        "-I$CUSTOM_DIR/generated"
         "-DFRED_SUPER"
         "-DFRED_INTERNAL"
     )

build_new/scripts/build-macos.sh

@@ -135,24 +135,18 @@ build_core_engine() {
         "-DFRED_INTERNAL"
     )
 
-    # Include directories for custom layer
-    local include_flags=(
-        "-I$CUSTOM_DIR"
-        "-I$CUSTOM_DIR/generated"
-    )
-
     print_info "Compiling core application library..."
     print_info "Input: $app_target"
     print_info "Output: $output_lib"
 
     # Compile core application shared library
     if [[ "${BUILD_VERBOSE:-}" == "1" ]]; then
-        echo "Executing: $CXX ${build_flags[*]} ${include_flags[*]} -o $output_lib $app_target ${LINK_LIBS[*]}"
+        echo "Executing: $CXX ${build_flags[*]} ${FCODER_INCLUDES[*]} -o $output_lib $app_target ${LINK_LIBS[*]}"
     fi
 
     $CXX \
         "${build_flags[@]}" \
-        "${include_flags[@]}" \
+        "${FCODER_INCLUDES[@]}" \
         -o "$output_lib" \
         "$app_target" \
         "${LINK_LIBS[@]}"
@@ -166,15 +160,11 @@ build_platform_layer() {
     local platform_source="$CODE_DIR/platform_mac/mac_4ed.mm"
     local output_exe="$BUILD_DIR/4ed"
 
-    local include_flags=(
-      "-I$CUSTOM_DIR"
-    )
-
     # Build flags for executable
     local build_flags=(
         "${COMPILE_FLAGS[@]}"
         "${PLATFORM_INCLUDES[@]}"
-        "${include_flags[@]}"
+        "${FCODER_INCLUDES[@]}"
         "-DFRED_SUPER"
         "-DFRED_INTERNAL"
     )
@@ -235,8 +225,7 @@ build_custom_layer() {
         "${COMPILE_FLAGS[@]}"
         "-shared"
         "-fPIC"
-        "-I$CUSTOM_DIR"
+        "${FCODER_INCLUDES[@]}"
-        "-I$CUSTOM_DIR/generated"
         "-DFRED_SUPER"
         "-DFRED_INTERNAL"
     )

build_new/scripts/build-metadata.sh

@@ -17,10 +17,10 @@ META_MACROS="-DMETA_PASS"
 print_step "Building Metadata"
 
 print_info "Running C Preprocessor"
-g++ -I"$CUSTOM_DIR" $META_MACROS $OPTS "$SOURCE" -E      -o $PREPROC_FILE
+g++ "${FCODER_INCLUDES[@]}" $META_MACROS $OPTS "$SOURCE" -E      -o $PREPROC_FILE
 
 print_info "Building Metadata Generator"
-g++ -I"$CUSTOM_DIR"              $OPTS $METADATA_GEN_SRC -o $METADATA_GEN_DST
+g++ "${FCODER_INCLUDES[@]}"              $OPTS $METADATA_GEN_SRC -o $METADATA_GEN_DST
 
 print_info "Running Metadata Generator"
 $METADATA_GEN_DST -R $CUSTOM_DIR "$PREPROC_FILE"

build_new/scripts/build-win32.sh

@@ -38,8 +38,7 @@ setup_win32_vars() {
     # Base flags for Windows
     COMMON_FLAGS=(
         "${CLANG_OPTS_WINDOWS[@]}"
-        "-I$CODE_DIR"
+        "${FCODER_INCLUDES[@]}"
-        "-I$FOREIGN_DIR/freetype2"
     )
 
     # Architecture-specific flags
@@ -161,24 +160,18 @@ build_core_engine() {
         "-DFRED_INTERNAL"
     )
 
-    # Include directories for custom layer
-    local include_flags=(
-        "-I$CUSTOM_DIR"
-        "-I$CUSTOM_DIR/generated"
-    )
-
     print_info "Compiling core application library..."
     print_info "Input: $app_target"
     print_info "Output: $output_lib"
 
     # Compile core application shared library
     if [[ "${BUILD_VERBOSE:-}" == "1" ]]; then
-        echo "Executing: $CXX ${build_flags[*]} ${include_flags[*]} -o $output_lib $app_target ${LINK_LIBS[*]}"
+        echo "Executing: $CXX ${build_flags[*]} ${FCODER_INCLUDES[*]} -o $output_lib $app_target ${LINK_LIBS[*]}"
     fi
 
     $CXX \
         "${build_flags[@]}" \
-        "${include_flags[@]}" \
+        "${FCODER_INCLUDES[@]}" \
         -o "$output_lib" \
         "$app_target" \
         "${LINK_LIBS[@]}"
@@ -270,8 +263,7 @@ build_custom_layer() {
     local build_flags=(
         "${COMPILE_FLAGS[@]}"
         "-shared"
-        "-I$CUSTOM_DIR"
+        "${FCODER_INCLUDES[@]}"
-        "-I$CUSTOM_DIR/generated"
         "-DFRED_SUPER"
         "-DFRED_INTERNAL"
     )