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

bring FWK as a _mirror submodule

main
Dominik Madarász 2023-10-09 08:23:27 +02:00
parent 559b0ae2da
commit d5443512f4
7 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,3 +1,6 @@
[submodule "depot"] [submodule "depot"]
path = depot path = depot
url = git@dev.v4.games:v4games/depot.git url = git@dev.v4.games:v4games/depot.git
[submodule "_mirror"]
path = _mirror
url = git@dev.v4.games:v4games/FWK-mirror.git

5
MAKE.bat
View File

@ -239,10 +239,9 @@ if "%1"=="vps" (
) )
if "%1"=="fwk_sync" ( if "%1"=="fwk_sync" (
pushd ..\fwk-mirror git submodule update --remote --merge _mirror/
call MAKE.bat sync
popd
call MAKE.bat fwk call MAKE.bat fwk
start "" fwk_diff.WinMerge
exit /b exit /b
) )

1
_mirror 160000

@ -0,0 +1 @@
Subproject commit 540f50da4da1d3cdae5f14a07f4cf963e651d26a

2
engine/joint/v4k.h
View File

@ -14757,7 +14757,7 @@ API void (map_clear)(map* m);
API char *cc4str(unsigned cc); API char *cc4str(unsigned cc);
API char *cc8str(uint64_t cc); API char *cc8str(uint64_t cc);
enum { enum { ///-
# define _(a,b,c,d,e) cc__##a, cc__##b, cc__##c, cc__##d, cc__##e # define _(a,b,c,d,e) cc__##a, cc__##b, cc__##c, cc__##d, cc__##e
cc__1 = '1', _(2,3,4,5,6),_(7,8,9,0,_), cc__ = ' ', cc__1 = '1', _(2,3,4,5,6),_(7,8,9,0,_), cc__ = ' ',
cc__A = 'A', _(B,C,D,E,F),_(G,H,I,J,K),_(L,M,N,O,P),_(Q,R,S,T,U),_(V,W,X,Y,Z), cc__A = 'A', _(B,C,D,E,F),_(G,H,I,J,K),_(L,M,N,O,P),_(Q,R,S,T,U),_(V,W,X,Y,Z),

2
engine/split/v4k_ds.h
View File

@ -433,7 +433,7 @@ API void (map_clear)(map* m);
API char *cc4str(unsigned cc); API char *cc4str(unsigned cc);
API char *cc8str(uint64_t cc); API char *cc8str(uint64_t cc);
enum { enum { ///-
# define _(a,b,c,d,e) cc__##a, cc__##b, cc__##c, cc__##d, cc__##e # define _(a,b,c,d,e) cc__##a, cc__##b, cc__##c, cc__##d, cc__##e
cc__1 = '1', _(2,3,4,5,6),_(7,8,9,0,_), cc__ = ' ', cc__1 = '1', _(2,3,4,5,6),_(7,8,9,0,_), cc__ = ' ',
cc__A = 'A', _(B,C,D,E,F),_(G,H,I,J,K),_(L,M,N,O,P),_(Q,R,S,T,U),_(V,W,X,Y,Z), cc__A = 'A', _(B,C,D,E,F),_(G,H,I,J,K),_(L,M,N,O,P),_(Q,R,S,T,U),_(V,W,X,Y,Z),

2
engine/v4k.h
View File

@ -824,7 +824,7 @@ API void (map_clear)(map* m);
API char *cc4str(unsigned cc); API char *cc4str(unsigned cc);
API char *cc8str(uint64_t cc); API char *cc8str(uint64_t cc);
enum { enum { ///-
# define _(a,b,c,d,e) cc__##a, cc__##b, cc__##c, cc__##d, cc__##e # define _(a,b,c,d,e) cc__##a, cc__##b, cc__##c, cc__##d, cc__##e
cc__1 = '1', _(2,3,4,5,6),_(7,8,9,0,_), cc__ = ' ', cc__1 = '1', _(2,3,4,5,6),_(7,8,9,0,_), cc__ = ' ',
cc__A = 'A', _(B,C,D,E,F),_(G,H,I,J,K),_(L,M,N,O,P),_(Q,R,S,T,U),_(V,W,X,Y,Z), cc__A = 'A', _(B,C,D,E,F),_(G,H,I,J,K),_(L,M,N,O,P),_(Q,R,S,T,U),_(V,W,X,Y,Z),

19
fwk_diff.WinMerge 100644
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<paths>
<left>C:\Projects\v4k\_fwk\</left>
<right>C:\Projects\v4k\_mirror\</right>
<filter>*.cpp,*.h,*.c</filter>
<subfolders>1</subfolders>
<left-readonly>0</left-readonly>
<right-readonly>1</right-readonly>
<white-spaces>2</white-spaces>
<ignore-blank-lines>0</ignore-blank-lines>
<ignore-case>0</ignore-case>
<ignore-carriage-return-diff>1</ignore-carriage-return-diff>
<ignore-numbers>0</ignore-numbers>
<ignore-codepage-diff>0</ignore-codepage-diff>
<ignore-comment-diff>0</ignore-comment-diff>
<compare-method>0</compare-method>
</paths>
</project>