Complete reorganization of code to support the compression code to be built as a DLL/LIB and the test program to use that as necessary. Migration not entirely complete as the test program cannot use the static LIB version.

Author: coderforlife

.gitignore

@@ -1,6 +1,8 @@
 *.lznt1
 *.xpress
 *.xpress_huff
+x86
+x64
 
 # Compiled Object files
 *.slo

build-c++.bat

@@ -4,9 +4,9 @@
 :: Make sure both mingw-w32\bin and mingw-w64\bin are in the PATH
 
 ::-Werror
-set FLAGS=-mconsole -static-libgcc -static-libstdc++ -O3 -march=core2 -Wall -s
-set FILES=compression.cpp Dictionary.cpp Bitstream.cpp lznt1.cpp lzx.cpp xpress.cpp xpress_huff.cpp test.cpp
-set OUT=compression
+set FLAGS=-mconsole -static-libgcc -static-libstdc++ -O3 -march=core2 -Wall -s -Ilibrary
+set FILES=test.cpp
+set OUT=test
 
 echo Compiling 32-bit...
 i686-w64-mingw32-g++ %FLAGS% %FILES% -o %OUT%.exe

build-c.bat

@@ -3,15 +3,18 @@
 :: This builds using MinGW-w64 for 32 and 64 bit (http://mingw-w64.sourceforge.net/)
 :: Make sure both mingw-w32\bin and mingw-w64\bin are in the PATH
 
+::-Werror
+set FLAGS=-mconsole -static-libgcc -O3 -march=core2 -Wall -s -Ilibrary
+set FILES=test.cpp
+set OUT=test
+
 echo Compiling 32-bit...
-i686-w64-mingw32-gcc -mconsole -static-libgcc -O3 -march=core2 -o compression.exe -s ^
-	compression.c Dictionary.c Bitstream.c lznt1.c lzx.c xpress.c xpress_huff.c test.c ^
+i686-w64-mingw32-gcc %FLAGS% %FILES% -o %OUT%.exe
 
 echo.
 
 echo Compiling 64-bit...
 
-x86_64-w64-mingw32-gcc -mconsole -static-libgcc -O3 -march=core2 -o compression64.exe -s ^
-	compression.c Dictionary.c Bitstream.c lznt1.c lzx.c xpress.c xpress_huff.c test.c
+x86_64-w64-mingw32-gcc %FLAGS% %FILES% -o %OUT%64.exe
 
 pause

compression.sln

@@ -1,6 +1,13 @@
-#include "stdafx.h"
 #include "Bitstream.h"
 
+#ifdef __cplusplus_cli
+#pragma unmanaged
+#endif
+
+#if defined(_MSC_VER) && defined(NDEBUG)
+#pragma optimize("t", on)
+#endif
+
 
 // Reading functions:
 void BSReadInit(InputBitstream* bstr, const_bytes in, size_t len)

Bitstream.cpp renamed to library/Bitstream.cpp

@@ -1,8 +1,11 @@
-#pragma once
-
 ////////////////////////////// Bitstreams //////////////////////////////////////////////////////////
 // A bitstream that allows either reading or writing, but not both at the same time.
 // It reads uint16s for bits and 16 bits can be reliably read at a time
+
+#ifndef BITSTREAM_H
+#define BITSTREAM_H
+#include "compression-api.h"
+
 struct _Bitstream
 {
 	union
@@ -32,3 +35,5 @@ void BSWriteInit(OutputBitstream* bstr, bytes out, size_t len);
 bool BSWriteBits(OutputBitstream* bstr, uint32_t b, byte n);
 bool BSWriteByte(OutputBitstream* bstr, byte b);
 void BSWriteFinish(OutputBitstream* bstr);
+
+#endif

Bitstream.h renamed to library/Bitstream.h

@@ -1,4 +1,3 @@
-#include "stdafx.h"
 #include "Dictionary.h"
 
 // Implementation designed for being extremely fast at the expense of memory
@@ -13,7 +12,9 @@
 #pragma unmanaged
 #endif
 
+#if defined(_MSC_VER) && defined(NDEBUG)
 #pragma optimize("t", on)
+#endif
 
 #define MAX_BYTE	0x100					// maximum byte value (+1 for 0)
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))	// minimum of 2 values

Dictionary.cpp renamed to library/Dictionary.cpp

@@ -1,5 +1,3 @@
-#pragma once
-
 /////////////////// Dictionary /////////////////////////////////////////////////
 // The dictionary system used for LZNT1 and XPRESS compression.
 //
@@ -9,6 +7,10 @@
 // completely agnostic to it and any of the function implementations.
 
 
+#ifndef DICTIONARY_H
+#define DICTIONARY_H
+#include "compression-api.h"
+
 struct _Dictionary;
 typedef struct _Dictionary Dictionary;
 
@@ -35,3 +37,5 @@ bool Dictionary_Add(Dictionary* d, const_bytes data, const size_t max_len);
 // Returns the length of the string found, or 0 if nothing of length >= 3 was found
 // offset is set to the offset from the current position to the string
 uint_fast16_t Dictionary_Find(const Dictionary* d, const Dictionary* d2, const_bytes data, const uint_fast16_t max_len, const_bytes search, uint_fast16_t* offset);
+
+#endif

Dictionary.h renamed to library/Dictionary.h

@@ -0,0 +1,28 @@
+@echo off
+
+:: This builds using MinGW-w64 for 32 and 64 bit (http://mingw-w64.sourceforge.net/)
+:: Make sure both mingw-w32\bin and mingw-w64\bin are in the PATH
+
+::-Werror
+set FLAGS=-static-libgcc -static-libstdc++ -O3 -march=core2 -Wall -s -D UNICODE -D _UNICODE -D COMPRESSION_API_EXPORT 
+set FILES=compression.cpp Dictionary.cpp Bitstream.cpp lznt1.cpp lzx.cpp xpress.cpp xpress_huff.cpp
+set OUT=MSCompression
+
+echo Compiling 32-bit...
+i686-w64-mingw32-g++ %FLAGS% -D COMPRESSION_API_DLL -shared %FILES% -o %OUT%.dll -Wl,--out-implib,lib%OUT%.dll.a
+
+i686-w64-mingw32-g++ %FLAGS% -D COMPRESSION_API_LIB -c %FILES%
+i686-w64-mingw32-ar rcs lib%OUT%.a *.o
+del /F /Q *.o >NUL 2>&1
+
+echo.
+
+echo Compiling 64-bit...
+
+x86_64-w64-mingw32-g++ %FLAGS% -D COMPRESSION_API_DLL -shared %FILES% -o %OUT%64.dll -Wl,--out-implib,lib%OUT%64.dll.a
+
+x86_64-w64-mingw32-g++ %FLAGS% -D COMPRESSION_API_LIB -c %FILES%
+x86_64-w64-mingw32-ar rcs lib%OUT%64.a *.o
+del /F /Q *.o >NUL 2>&1
+
+pause

library/build-c++.bat

@@ -0,0 +1,28 @@
+@echo off
+
+:: This builds using MinGW-w64 for 32 and 64 bit (http://mingw-w64.sourceforge.net/)
+:: Make sure both mingw-w32\bin and mingw-w64\bin are in the PATH
+
+::-Werror
+set FLAGS=-static-libgcc -O3 -march=core2 -Wall -s -D UNICODE -D _UNICODE -D COMPRESSION_API_EXPORT 
+set FILES=compression.cpp Dictionary.cpp Bitstream.cpp lznt1.cpp lzx.cpp xpress.cpp xpress_huff.cpp
+set OUT=MSCompression
+
+echo Compiling 32-bit...
+i686-w64-mingw32-gcc %FLAGS% -D COMPRESSION_API_DLL -shared %FILES% -o %OUT%.dll -Wl,--out-implib,lib%OUT%.dll.a
+
+i686-w64-mingw32-gcc %FLAGS% -D COMPRESSION_API_LIB -c %FILES%
+i686-w64-mingw32-ar rcs lib%OUT%.a *.o
+del /F /Q *.o >NUL 2>&1
+
+echo.
+
+echo Compiling 64-bit...
+
+x86_64-w64-mingw32-gcc %FLAGS% -D COMPRESSION_API_DLL -shared %FILES% -o %OUT%64.dll -Wl,--out-implib,lib%OUT%64.dll.a
+
+x86_64-w64-mingw32-gcc %FLAGS% -D COMPRESSION_API_LIB -c %FILES%
+x86_64-w64-mingw32-ar rcs lib%OUT%64.a *.o
+del /F /Q *.o >NUL 2>&1
+
+pause