topchetoeu/ppc-lang
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: add minor version to output names

Browse Source
This commit is contained in:
TopchetoEU 2023-01-27 18:40:44 +02:00
parent bef3c378d9
commit ca7a3509f9
No known key found for this signature in database
GPG Key ID: 5ED5FFB2A3F5DB21
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -1,7 +1,7 @@
export MAKEFLAGS += --silent -r -j export MAKEFLAGS += --silent -r -j
export flags=-std=c++17 -Wall -Wno-main -Wno-trigraphs -Wno-missing-braces -Wno-stringop-overflow -DPROFILE_$(profile) -fdiagnostics-color=always export flags=-std=c++17 -Wall -Wno-main -Wno-trigraphs -Wno-missing-braces -Wno-stringop-overflow -DPROFILE_$(profile) -fdiagnostics-color=always
export ldflags=-L$(bin)/$(profile) -Wl,-rpath=bin/$(profile) export ldflags=-L$(bin)/$(profile) -Wl,-rpath=bin/$(profile)
export lib=ppc$(version-major)- export lib=ppc-$(version-major).$(version-minor)-
export profile=release export profile=release
############# SETTINGS ############ ############# SETTINGS ############
@ -45,7 +45,7 @@ export CC=gcc
export CXX=g++ export CXX=g++
# export version-build=$(if $(wildcard build.version),$(shell type build.version),0) # export version-build=$(if $(wildcard build.version),$(shell type build.version),0)
export binary = $(bin)/$(output)$(version-major)-windows.exe export binary = $(bin)/$(output)-$(version-major).$(version-minor)-windows.exe
build: version build: version
echo ======================== Compiling ========================= echo ======================== Compiling =========================
@ -75,7 +75,7 @@ export rmdir=rm -rf $$1
export echo=echo "$$1" export echo=echo "$$1"
export so=.so export so=.so
# export version-build=$(if $(wildcard build.version),$(shell cat build.version),0) # export version-build=$(if $(wildcard build.version),$(shell cat build.version),0)
export binary = $(bin)/$(output)$(version-major)-linux export binary = $(bin)/$(output)-$(version-major).$(version-minor)-linux
build: version build: version
echo ======================== Compiling ========================= echo ======================== Compiling =========================

6
include/lang/common.hh
View File

@ -65,7 +65,7 @@ namespace ppc::lang {
nmsp_t strip_location() const; nmsp_t strip_location() const;
std::string to_string() const; std::string to_string() const;
operator nmsp_t() { return strip_location(); } operator nmsp_t() const { return strip_location(); }
operator std::string() const { return to_string(); } operator std::string() const { return to_string(); }
loc_nmsp_t() { } loc_nmsp_t() { }
@ -76,8 +76,8 @@ namespace ppc::lang {
bool resolve_name(const SetT &defs, const nmsp_t &src, const nmsp_t &target) { bool resolve_name(const SetT &defs, const nmsp_t &src, const nmsp_t &target) {
if (src == target) return true; if (src == target) return true;
for (const auto &it : defs) { for (auto it : defs) {
nmsp_t val = (const nmsp_t&)(it); nmsp_t val = (nmsp_t)(it);
val.insert(val.end(), src.begin(), src.end()); val.insert(val.end(), src.begin(), src.end());
if (val == target) return true; if (val == target) return true;