From 27aedcd3c47973d274531493fc0186cd0a88b398 Mon Sep 17 00:00:00 2001 From: gucio321 Date: Wed, 5 Apr 2023 09:26:19 +0200 Subject: [PATCH 1/4] generator: pass command-line arguments to GCC --- generator/generator.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generator/generator.sh b/generator/generator.sh index 92d7ae4..e2840c5 100755 --- a/generator/generator.sh +++ b/generator/generator.sh @@ -22,4 +22,4 @@ then suffix='.exe' fi -luajit$suffix ./generator.lua gcc "internal noimstrv" glfw opengl3 opengl2 sdl2 +luajit$suffix ./generator.lua gcc "internal noimstrv" glfw opengl3 opengl2 sdl2 "$@" From 4d19dd5e170b207f7db747961392787e67efe3ca Mon Sep 17 00:00:00 2001 From: gucio321 Date: Wed, 5 Apr 2023 10:30:26 +0200 Subject: [PATCH 2/4] generattor: add --cflags command line flag --- generator/generator.sh | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/generator/generator.sh b/generator/generator.sh index e2840c5..794efe1 100755 --- a/generator/generator.sh +++ b/generator/generator.sh @@ -16,10 +16,38 @@ # arg[2] options as words in one string: internal for imgui_internal generation, freetype for freetype generation, comments for comments generation, nochar to skip char* function version, noimstrv to skip imstrv # examples: "" "internal" "internal freetype" "comments internal" # arg[3..n] name of implementations to generate and/or CLFLAGS (e.g. -DIMGUI_USER_CONFIG or -DIMGUI_USE_WCHAR32) +# +#!/bin/bash + +# parse command line arguments +# ref: https://stackoverflow.com/questions/192249/how-do-i-parse-command-line-arguments-in-bash +POSITIONAL_ARGS=() + +while [[ $# -gt 0 ]]; do + case $1 in + -c|--cflags) + CFLAGS="$2" + shift # past argument + shift # past value + ;; + -*|--*) + echo "Unknown option $1" + exit 1 + ;; + *) + POSITIONAL_ARGS+=("$1") # save positional arg + shift # past argument + ;; + esac +done + +set -- "${POSITIONAL_ARGS[@]}" # restore positional parameters if [[ "$OSTYPE" == "cygwin" || "$OSTYPE" == "msys" || "$OSTYPE" == "win32" ]]; then suffix='.exe' fi -luajit$suffix ./generator.lua gcc "internal noimstrv" glfw opengl3 opengl2 sdl2 "$@" +echo "CFLAGS: " $CFLAGS + +luajit$suffix ./generator.lua gcc "internal noimstrv" glfw opengl3 opengl2 sdl2 $CFLAGS From 2ae35c8b4673a6f9b683b4ac8d838fd3f34b4237 Mon Sep 17 00:00:00 2001 From: gucio321 Date: Wed, 5 Apr 2023 10:49:02 +0200 Subject: [PATCH 3/4] Revert "generattor: add --cflags command line flag" This reverts commit 4d19dd5e170b207f7db747961392787e67efe3ca. --- generator/generator.sh | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/generator/generator.sh b/generator/generator.sh index 794efe1..e2840c5 100755 --- a/generator/generator.sh +++ b/generator/generator.sh @@ -16,38 +16,10 @@ # arg[2] options as words in one string: internal for imgui_internal generation, freetype for freetype generation, comments for comments generation, nochar to skip char* function version, noimstrv to skip imstrv # examples: "" "internal" "internal freetype" "comments internal" # arg[3..n] name of implementations to generate and/or CLFLAGS (e.g. -DIMGUI_USER_CONFIG or -DIMGUI_USE_WCHAR32) -# -#!/bin/bash - -# parse command line arguments -# ref: https://stackoverflow.com/questions/192249/how-do-i-parse-command-line-arguments-in-bash -POSITIONAL_ARGS=() - -while [[ $# -gt 0 ]]; do - case $1 in - -c|--cflags) - CFLAGS="$2" - shift # past argument - shift # past value - ;; - -*|--*) - echo "Unknown option $1" - exit 1 - ;; - *) - POSITIONAL_ARGS+=("$1") # save positional arg - shift # past argument - ;; - esac -done - -set -- "${POSITIONAL_ARGS[@]}" # restore positional parameters if [[ "$OSTYPE" == "cygwin" || "$OSTYPE" == "msys" || "$OSTYPE" == "win32" ]]; then suffix='.exe' fi -echo "CFLAGS: " $CFLAGS - -luajit$suffix ./generator.lua gcc "internal noimstrv" glfw opengl3 opengl2 sdl2 $CFLAGS +luajit$suffix ./generator.lua gcc "internal noimstrv" glfw opengl3 opengl2 sdl2 "$@" From 9d1e63d3065521f9dcae65febbb8a34eebaa64b1 Mon Sep 17 00:00:00 2001 From: gucio321 Date: Wed, 5 Apr 2023 10:49:45 +0200 Subject: [PATCH 4/4] generator.bat: pass cmd line arguments to luajit --- generator/generator.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generator/generator.bat b/generator/generator.bat index c9b292c..9d4f6e8 100644 --- a/generator/generator.bat +++ b/generator/generator.bat @@ -18,7 +18,7 @@ set PATH=%PATH%;C:\anima;C:\mingws\i686-7.2.0-release-posix-dwarf-rt_v5-rev1\min :: arg[2] options as words in one string: internal for imgui_internal generation, freetype for freetype generation, comments for comments generation, nochar to skip char* function version, noimstrv to skip imstrv :: examples: "" "internal" "internal freetype comments" :: arg[3..n] name of implementations to generate and/or CFLAGS (e.g. -DIMGUI_USER_CONFIG or -DIMGUI_USE_WCHAR32) -luajit ./generator.lua gcc "internal noimstrv" glfw opengl3 opengl2 sdl2 +luajit ./generator.lua gcc "internal noimstrv" glfw opengl3 opengl2 sdl2 %* ::leave console open cmd /k