v4games
/
v4k-git-backup
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cook: drop V4K_TITLE alias handling

main
Dominik Madarász 2023-10-12 07:23:32 +02:00
parent 9d26ece8da
commit 48022b47f0
6 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,6 +1,7 @@
.art*.zip .art*.zip
__pycache__ __pycache__
.vs .vs
_deploy
emsdk emsdk
demos/html5/*.data demos/html5/*.data
demos/html5/*.js demos/html5/*.js

1
MAKE.bat
View File

@ -396,6 +396,7 @@ rem del ??-*.* > nul 2> nul
rd /q /s _release > nul 2> nul rd /q /s _release > nul 2> nul
rd /q /s _fwk > nul 2> nul rd /q /s _fwk > nul 2> nul
rd /q /s _cache > nul 2> nul rd /q /s _cache > nul 2> nul
rd /q /s _deploy > nul 2> nul
rem rd /q /s _project > nul 2> nul rem rd /q /s _project > nul 2> nul
del tcc.bat > nul 2> nul del tcc.bat > nul 2> nul
del sh.bat > nul 2> nul del sh.bat > nul 2> nul

9
engine/joint/v4k.h
View File

@ -335374,14 +335374,7 @@ bool cook_start( const char *cook_ini, const char *masks, int flags ) {
char *out = 0; const char *sep = ""; char *out = 0; const char *sep = "";
const char *v4k_title = getenv("V4K_TITLE"); const char *v4k_title = getenv("V4K_TITLE");
for each_substring(ART, ",", t) { for each_substring(ART, ",", t) {
char *tt = t; char *tmp = file_pathabs(va("%s%s", HOME, t)) + ART_LEN;
if (v4k_title && strlen(v4k_title) > 0) {
const char *symbols[] = { "{{V4K_TITLE}}", getenv("V4K_TITLE") };
tt = (char *)strlerp(1, symbols, t);
} else if (strstri(tt, "{{V4K_TITLE}}")) {
continue;
}
char *tmp = file_pathabs(va("%s%s", HOME, tt)) + ART_LEN;
PRINTF("ART mount+=%s\n", tmp); PRINTF("ART mount+=%s\n", tmp);
for(int i = 0; tmp[i]; ++i) if(tmp[i]=='\\') tmp[i] = '/'; for(int i = 0; tmp[i]; ++i) if(tmp[i]=='\\') tmp[i] = '/';
strcatf(&out, "%s%s%s", sep, tmp, strendi(tmp, "/") ? "" : "/"); strcatf(&out, "%s%s%s", sep, tmp, strendi(tmp, "/") ? "" : "/");

9
engine/split/v4k_cooker.c
View File

@ -623,14 +623,7 @@ bool cook_start( const char *cook_ini, const char *masks, int flags ) {
char *out = 0; const char *sep = ""; char *out = 0; const char *sep = "";
const char *v4k_title = getenv("V4K_TITLE"); const char *v4k_title = getenv("V4K_TITLE");
for each_substring(ART, ",", t) { for each_substring(ART, ",", t) {
char *tt = t; char *tmp = file_pathabs(va("%s%s", HOME, t)) + ART_LEN;
if (v4k_title && strlen(v4k_title) > 0) {
const char *symbols[] = { "{{V4K_TITLE}}", getenv("V4K_TITLE") };
tt = (char *)strlerp(1, symbols, t);
} else if (strstri(tt, "{{V4K_TITLE}}")) {
continue;
}
char *tmp = file_pathabs(va("%s%s", HOME, tt)) + ART_LEN;
PRINTF("ART mount+=%s\n", tmp); PRINTF("ART mount+=%s\n", tmp);
for(int i = 0; tmp[i]; ++i) if(tmp[i]=='\\') tmp[i] = '/'; for(int i = 0; tmp[i]; ++i) if(tmp[i]=='\\') tmp[i] = '/';
strcatf(&out, "%s%s%s", sep, tmp, strendi(tmp, "/") ? "" : "/"); strcatf(&out, "%s%s%s", sep, tmp, strendi(tmp, "/") ? "" : "/");

9
engine/v4k.c
View File

@ -4438,14 +4438,7 @@ bool cook_start( const char *cook_ini, const char *masks, int flags ) {
char *out = 0; const char *sep = ""; char *out = 0; const char *sep = "";
const char *v4k_title = getenv("V4K_TITLE"); const char *v4k_title = getenv("V4K_TITLE");
for each_substring(ART, ",", t) { for each_substring(ART, ",", t) {
char *tt = t; char *tmp = file_pathabs(va("%s%s", HOME, t)) + ART_LEN;
if (v4k_title && strlen(v4k_title) > 0) {
const char *symbols[] = { "{{V4K_TITLE}}", getenv("V4K_TITLE") };
tt = (char *)strlerp(1, symbols, t);
} else if (strstri(tt, "{{V4K_TITLE}}")) {
continue;
}
char *tmp = file_pathabs(va("%s%s", HOME, tt)) + ART_LEN;
PRINTF("ART mount+=%s\n", tmp); PRINTF("ART mount+=%s\n", tmp);
for(int i = 0; tmp[i]; ++i) if(tmp[i]=='\\') tmp[i] = '/'; for(int i = 0; tmp[i]; ++i) if(tmp[i]=='\\') tmp[i] = '/';
strcatf(&out, "%s%s%s", sep, tmp, strendi(tmp, "/") ? "" : "/"); strcatf(&out, "%s%s%s", sep, tmp, strendi(tmp, "/") ? "" : "/");

2
tools/cook.ini
View File

@ -7,7 +7,7 @@
; syntax: symbols are defined in KEY=value form, as seen below. ; syntax: symbols are defined in KEY=value form, as seen below.
TOOLS=./ ; folder where our pipeline tools are located TOOLS=./ ; folder where our pipeline tools are located
ART=../demos/art/,../engine/art/,../depot/art/common/,../depot/art/{{V4K_TITLE}}/ ; comma-separated folder(s) that store all our asset files ART=../demos/art/,../engine/art/ ; comma-separated folder(s) that store all our asset files
; lines starting with @windows, @linux or @osx will be processed only where OS matches. ; lines starting with @windows, @linux or @osx will be processed only where OS matches.
; we are defining here some symbols differently for each platform. ; we are defining here some symbols differently for each platform.