Merge remote-tracking branch 'remotes/git-svn'

nukeykt · Nov 7, 2018 · 5e6b962 · 5e6b962
2 parents 94e2d59 + e6ccefa
commit 5e6b962
Show file tree

Hide file tree

Showing 34 changed files with 583 additions and 374 deletions.
diff --git a/GNUmakefile b/GNUmakefile
@@ -165,6 +165,7 @@ engine_objs := \
     rev.cpp \
     baselayer.cpp \
     cache1d.cpp \
+    klzw.cpp \
     common.cpp \
     compat.cpp \
     crc32.cpp \
@@ -211,6 +212,7 @@ engine_tools_objs := \
     pragmas.cpp \
     kplib.cpp \
     cache1d.cpp \
+    klzw.cpp \
     crc32.cpp \
     colmatch.cpp \
     lz4.cpp \
@@ -998,9 +1000,9 @@ $(ebacktrace_dll): platform/Windows/src/backtrace.c
 	$(COMPILE_STATUS)
 	$(RECIPE_IF) $(CC) $(CONLYFLAGS) -O2 -ggdb -shared -Wall -Wextra -static-libgcc -I$(engine_inc) -o $@ $^ -lbfd -liberty -limagehlp $(RECIPE_RESULT_COMPILE)
 
-libcache1d$(DLLSUFFIX): $(engine_src)/cache1d.cpp
+libklzw$(DLLSUFFIX): $(engine_src)/klzw.cpp
 	$(COMPILE_STATUS)
-	$(RECIPE_IF) $(COMPILER_C) -DCACHE1D_COMPRESS_ONLY -shared -fPIC $< -o $@ $(RECIPE_RESULT_COMPILE)
+	$(RECIPE_IF) $(COMPILER_C) -shared -fPIC $< -o $@ $(RECIPE_RESULT_COMPILE)
 
 # to debug the tools link phase, make a copy of this rule explicitly replacing % with the name of a tool, such as kextract
 %$(EXESUFFIX): $(tools_obj)/%.$o $(foreach i,tools $(tools_deps),$(call expandobjs,$i))

diff --git a/platform/Windows/build.vcxproj b/platform/Windows/build.vcxproj
@@ -225,6 +225,7 @@
     <ClCompile Include="..\..\source\build\src\hash.cpp" />
     <ClCompile Include="..\..\source\build\src\hightile.cpp" />
     <ClCompile Include="..\..\source\build\src\jwzgles.c" />
+    <ClCompile Include="..\..\source\build\src\klzw.cpp" />
     <ClCompile Include="..\..\source\build\src\kplib.cpp" />
     <ClCompile Include="..\..\source\build\src\lunatic.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -334,6 +335,7 @@
     <ClInclude Include="..\..\source\build\include\hightile.h" />
     <ClInclude Include="..\..\source\build\include\jwzgles.h" />
     <ClInclude Include="..\..\source\build\include\jwzglesI.h" />
+    <ClInclude Include="..\..\source\build\include\klzw.h" />
     <ClInclude Include="..\..\source\build\include\kplib.h" />
     <ClInclude Include="..\..\source\build\include\libdivide.h" />
     <ClInclude Include="..\..\source\build\include\lz4.h" />

diff --git a/platform/Windows/build.vcxproj.filters b/platform/Windows/build.vcxproj.filters
@@ -77,6 +77,9 @@
     <ClCompile Include="..\..\source\build\src\jwzgles.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\source\build\src\klzw.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\source\build\src\kplib.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -274,6 +277,9 @@
     <ClInclude Include="..\..\source\build\include\jwzglesI.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\source\build\include\klzw.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\source\build\include\kplib.h">
       <Filter>Header Files</Filter>
     </ClInclude>

diff --git a/platform/Windows/msvc.mak b/platform/Windows/msvc.mak
@@ -149,6 +149,7 @@ ENGINE_OBJS= \
 	$(ENGINE_OBJ)\animvpx.$o \
 	$(ENGINE_OBJ)\baselayer.$o \
 	$(ENGINE_OBJ)\cache1d.$o \
+	$(ENGINE_OBJ)\klzw.$o \
 	$(ENGINE_OBJ)\common.$o \
 	$(ENGINE_OBJ)\compat.$o \
 	$(ENGINE_OBJ)\crc32.$o \

diff --git a/source/build/include/build.h b/source/build/include/build.h
@@ -4,6 +4,7 @@
 //
 // This file has been modified from Ken Silverman's original release
 // by Jonathon Fowler (jf@jonof.id.au)
+// by the EDuke32 team (development@voidpoint.com)
 
 #pragma once
 

diff --git a/source/build/include/cache1d.h b/source/build/include/cache1d.h
@@ -1,4 +1,10 @@
-// cache1d.h
+// "Build Engine & Tools" Copyright (c) 1993-1997 Ken Silverman
+// Ken Silverman's official web site: "http://www.advsys.net/ken"
+// See the included license file "BUILDLIC.TXT" for license info.
+//
+// This file has been modified from Ken Silverman's original release
+// by Jonathon Fowler (jf@jonof.id.au)
+// by the EDuke32 team (development@voidpoint.com)
 
 #ifndef cache1d_h_
 #define cache1d_h_

diff --git a/source/build/include/clip.h b/source/build/include/clip.h
@@ -1,3 +1,11 @@
+// "Build Engine & Tools" Copyright (c) 1993-1997 Ken Silverman
+// Ken Silverman's official web site: "http://www.advsys.net/ken"
+// See the included license file "BUILDLIC.TXT" for license info.
+//
+// This file has been modified from Ken Silverman's original release
+// by Jonathon Fowler (jf@jonof.id.au)
+// by the EDuke32 team (development@voidpoint.com)
+
 #pragma once
 
 #ifndef clip_h_

diff --git a/source/build/include/editor.h b/source/build/include/editor.h
@@ -1,6 +1,10 @@
 // "Build Engine & Tools" Copyright (c) 1993-1997 Ken Silverman
 // Ken Silverman's official web site: "http://www.advsys.net/ken"
 // See the included license file "BUILDLIC.TXT" for license info.
+//
+// This file has been modified from Ken Silverman's original release
+// by Jonathon Fowler (jf@jonof.id.au)
+// by the EDuke32 team (development@voidpoint.com)
 
 #ifndef editor_h_
 #define editor_h_

diff --git a/source/build/include/klzw.h b/source/build/include/klzw.h
@@ -0,0 +1,30 @@
+// "Build Engine & Tools" Copyright (c) 1993-1997 Ken Silverman
+// Ken Silverman's official web site: "http://www.advsys.net/ken"
+// See the included license file "BUILDLIC.TXT" for license info.
+//
+// This file has been modified from Ken Silverman's original release
+// by Jonathon Fowler (jf@jonof.id.au)
+// by the EDuke32 team (development@voidpoint.com)
+
+#ifndef klzw_h_
+#define klzw_h_
+
+#include "compat.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// These two follow the argument order of the C functions "read" and "write":
+// handle, buffer, length.
+typedef int32_t (*klzw_readfunc)(intptr_t, void *, int32_t);
+typedef void (*klzw_writefunc)(intptr_t, void const *, int32_t);
+
+int32_t klzw_read_compressed(void *buffer, bsize_t dasizeof, bsize_t count, intptr_t f, klzw_readfunc readfunc);
+void klzw_write_compressed(const void *buffer, bsize_t dasizeof, bsize_t count, intptr_t f, klzw_writefunc writefunc);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // klzw_h_
diff --git a/source/build/include/mmulti.h b/source/build/include/mmulti.h
@@ -1,4 +1,10 @@
-// mmulti.h
+// "Build Engine & Tools" Copyright (c) 1993-1997 Ken Silverman
+// Ken Silverman's official web site: "http://www.advsys.net/ken"
+// See the included license file "BUILDLIC.TXT" for license info.
+//
+// This file has been modified from Ken Silverman's original release
+// by Jonathon Fowler (jf@jonof.id.au)
+// by the EDuke32 team (development@voidpoint.com)
 
 #ifndef mmulti_h_
 #define mmulti_h_

diff --git a/source/build/include/palette.h b/source/build/include/palette.h
@@ -1,3 +1,11 @@
+// "Build Engine & Tools" Copyright (c) 1993-1997 Ken Silverman
+// Ken Silverman's official web site: "http://www.advsys.net/ken"
+// See the included license file "BUILDLIC.TXT" for license info.
+//
+// This file has been modified from Ken Silverman's original release
+// by Jonathon Fowler (jf@jonof.id.au)
+// by the EDuke32 team (development@voidpoint.com)
+
 #pragma once
 
 #ifndef palette_h_

diff --git a/source/build/include/pragmas.h b/source/build/include/pragmas.h
@@ -1,6 +1,10 @@
+// "Build Engine & Tools" Copyright (c) 1993-1997 Ken Silverman
+// Ken Silverman's official web site: "http://www.advsys.net/ken"
+// See the included license file "BUILDLIC.TXT" for license info.
+//
 // This file has been modified from Ken Silverman's original release
 // by Jonathon Fowler (jf@jonof.id.au)
-
+// by the EDuke32 team (development@voidpoint.com)
 
 #ifndef pragmas_h_
 #define pragmas_h_

diff --git a/source/build/src/2d.cpp b/source/build/src/2d.cpp
@@ -1,3 +1,11 @@
+// "Build Engine & Tools" Copyright (c) 1993-1997 Ken Silverman
+// Ken Silverman's official web site: "http://www.advsys.net/ken"
+// See the included license file "BUILDLIC.TXT" for license info.
+//
+// This file has been modified from Ken Silverman's original release
+// by Jonathon Fowler (jf@jonof.id.au)
+// by the EDuke32 team (development@voidpoint.com)
+
 #include "build.h"
 #include "editor.h"
 

diff --git a/source/build/src/a-c.cpp b/source/build/src/a-c.cpp
@@ -5,6 +5,10 @@
 // "Build Engine & Tools" Copyright (c) 1993-1997 Ken Silverman
 // Ken Silverman's official web site: "http://www.advsys.net/ken"
 // See the included license file "BUILDLIC.TXT" for license info.
+//
+// This file has been modified from Ken Silverman's original release
+// by Jonathon Fowler (jf@jonof.id.au)
+// by the EDuke32 team (development@voidpoint.com)
 
 #include "a.h"
 #include "pragmas.h"

diff --git a/source/build/src/a.masm b/source/build/src/a.masm
@@ -1,6 +1,10 @@
 ; "Build Engine & Tools" Copyright (c) 1993-1997 Ken Silverman
 ; Ken Silverman's official web site: "http://www.advsys.net/ken"
 ; See the included license file "BUILDLIC.TXT" for license info.
+;
+; This file has been modified from Ken Silverman's original release
+; by Jonathon Fowler (jf@jonof.id.au)
+; by the EDuke32 team (development@voidpoint.com)
 
 .586P
 ;.8087

diff --git a/source/build/src/a.nasm b/source/build/src/a.nasm
@@ -4,6 +4,7 @@
 ;
 ; This file has been modified from Ken Silverman's original release
 ; by Jonathon Fowler (jf@jonof.id.au)
+; by the EDuke32 team (development@voidpoint.com)
 
 %ifidn __OUTPUT_FORMAT__, x64
 %define ASM_x86_64

diff --git a/source/build/src/build.cpp b/source/build/src/build.cpp
@@ -4,6 +4,7 @@
 //
 // This file has been modified from Ken Silverman's original release
 // by Jonathon Fowler (jf@jonof.id.au)
+// by the EDuke32 team (development@voidpoint.com)
 
 #include "build.h"
 #include "compat.h"