diff --git a/.gitignore b/.gitignore index 2826ee7..741a58e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .art*.zip __pycache__ .vs +_deploy emsdk demos/html5/*.data demos/html5/*.js diff --git a/MAKE.bat b/MAKE.bat index 48804bd..1fc6783 100644 --- a/MAKE.bat +++ b/MAKE.bat @@ -396,6 +396,7 @@ rem del ??-*.* > nul 2> nul rd /q /s _release > nul 2> nul rd /q /s _fwk > 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 del tcc.bat > nul 2> nul del sh.bat > nul 2> nul diff --git a/engine/joint/v4k.h b/engine/joint/v4k.h index a177813..0cbd895 100644 --- a/engine/joint/v4k.h +++ b/engine/joint/v4k.h @@ -335374,14 +335374,7 @@ bool cook_start( const char *cook_ini, const char *masks, int flags ) { char *out = 0; const char *sep = ""; const char *v4k_title = getenv("V4K_TITLE"); for each_substring(ART, ",", t) { - char *tt = t; - 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; + char *tmp = file_pathabs(va("%s%s", HOME, t)) + ART_LEN; PRINTF("ART mount+=%s\n", tmp); for(int i = 0; tmp[i]; ++i) if(tmp[i]=='\\') tmp[i] = '/'; strcatf(&out, "%s%s%s", sep, tmp, strendi(tmp, "/") ? "" : "/"); diff --git a/engine/split/v4k_cooker.c b/engine/split/v4k_cooker.c index c56d921..a10048f 100644 --- a/engine/split/v4k_cooker.c +++ b/engine/split/v4k_cooker.c @@ -623,14 +623,7 @@ bool cook_start( const char *cook_ini, const char *masks, int flags ) { char *out = 0; const char *sep = ""; const char *v4k_title = getenv("V4K_TITLE"); for each_substring(ART, ",", t) { - char *tt = t; - 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; + char *tmp = file_pathabs(va("%s%s", HOME, t)) + ART_LEN; PRINTF("ART mount+=%s\n", tmp); for(int i = 0; tmp[i]; ++i) if(tmp[i]=='\\') tmp[i] = '/'; strcatf(&out, "%s%s%s", sep, tmp, strendi(tmp, "/") ? "" : "/"); diff --git a/engine/v4k.c b/engine/v4k.c index d7951bd..997aed3 100644 --- a/engine/v4k.c +++ b/engine/v4k.c @@ -4438,14 +4438,7 @@ bool cook_start( const char *cook_ini, const char *masks, int flags ) { char *out = 0; const char *sep = ""; const char *v4k_title = getenv("V4K_TITLE"); for each_substring(ART, ",", t) { - char *tt = t; - 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; + char *tmp = file_pathabs(va("%s%s", HOME, t)) + ART_LEN; PRINTF("ART mount+=%s\n", tmp); for(int i = 0; tmp[i]; ++i) if(tmp[i]=='\\') tmp[i] = '/'; strcatf(&out, "%s%s%s", sep, tmp, strendi(tmp, "/") ? "" : "/"); diff --git a/tools/cook.ini b/tools/cook.ini index d762020..501682a 100644 --- a/tools/cook.ini +++ b/tools/cook.ini @@ -7,7 +7,7 @@ ; syntax: symbols are defined in KEY=value form, as seen below. 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. ; we are defining here some symbols differently for each platform.