ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5764 from orbea/config.h 

qb: Turn $CONFIG_DEFINES from a temporary file into a variable.
This commit is contained in:
Twinaphex 2017-11-24 02:44:39 +01:00 committed by GitHub
parent c2eaf98c00 6351e21d9e
commit 67bec764a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -95,7 +95,6 @@ pkg/apple/iOS/modules/
obj-unix/ obj-unix/
.vagrant/ .vagrant/
.CONFIG_DEFINES
/pkg/msvc/Release Cg/*.exe /pkg/msvc/Release Cg/*.exe
/pkg/msvc/Release Cg/*.iobj /pkg/msvc/Release Cg/*.iobj
/pkg/msvc/Release Cg/*.ipdb /pkg/msvc/Release Cg/*.ipdb

15
qb/qb.libs.sh
View File

@ -1,12 +1,10 @@
MAKEFILE_DEFINES='' MAKEFILE_DEFINES=''
CONFIG_DEFINES='.CONFIG_DEFINES' CONFIG_DEFINES=''
cat /dev/null > "$CONFIG_DEFINES"
#cat /dev/null > "${CONFIG_DEFINES=.CONFIG_DEFINES}"
[ "$PREFIX" ] || PREFIX="/usr/local" [ "$PREFIX" ] || PREFIX="/usr/local"
add_define_header() add_define_header()
{ echo "$1=$2" >> "$CONFIG_DEFINES";} { CONFIG_DEFINES="${CONFIG_DEFINES} $1=$2"; }
add_define_make() add_define_make()
{ MAKEFILE_DEFINES="${MAKEFILE_DEFINES} $1=$2"; } { MAKEFILE_DEFINES="${MAKEFILE_DEFINES} $1=$2"; }
@ -207,9 +205,10 @@ create_config_header()
shift shift
done done
while IFS='=' read -r VAR VAL; do eval "set -- $CONFIG_DEFINES"
printf %s\\n "#define $VAR $VAL" for VAR do
done < "$CONFIG_DEFINES" printf %s\\n "#define ${VAR%%=*} ${VAR#*=}"
done
printf %s\\n '#endif' printf %s\\n '#endif'
} > "$outfile" } > "$outfile"
@ -264,5 +263,3 @@ create_config_make()
} }
. qb/config.libs.sh . qb/config.libs.sh
rm -f -- "$CONFIG_DEFINES"