+ Removed warnings from MINGW

+ Fixed Win32 makefile

8 files changed, 264 insertions, 251 deletions

diff --git a/makefile.w32 b/makefile.w32
index 3ea576a..9c88fae 100644
--- a/makefile.w32
+++ b/makefile.w32
@@ -8,247 +8,249 @@
 #    
 #####################################################################
 
-PATH   = C:\TOOLS32\MINGW\bin
-CPP    = g++
-CC     = gcc
-CFLAGS = -Wall
-DFLAGS = -D_7ZIP_ST
-LFLAGS = -shared
-#LFLAGS = -lbz2 -lz
-AR     = ar
-ARFLAGS= rcs
+CC        = @gcc
+CPP       = @g++
+CFLAGS    = -Wall
+DFLAGS    = -D_7ZIP_ST
+EXELFLAGS = -s -Wl --subsystem,console -lwininet
+DLLLFLAGS = -shared -lwininet
+AR        = ar
+ARFLAGS   = rcs
 
-LIBRARY  = StormLib.dll
-#LIBRARY  = StormLib.lib
+LIBRARY   = StormLib.dll
+TESTEXE   = StormLib_test.exe
 
-OBJS_CPP = src/adpcm/adpcm.o \
-           src/huffman/huff.o \
-           src/sparse/sparse.o \
-           src/FileStream.o \
-           src/SBaseCommon.o \
-           src/SBaseDumpData.o \
-           src/SBaseFileTable.o \
-           src/SBaseSubTypes.o \
-           src/SCompression.o \
-           src/SFileAddFile.o \
-           src/SFileAttributes.o \
-           src/SFileCompactArchive.o \
-           src/SFileCreateArchive.o \
-           src/SFileExtractFile.o \
-           src/SFileFindFile.o \
-           src/SFileGetFileInfo.o \
-           src/SFileListFile.o \
-           src/SFileOpenArchive.o \
-           src/SFileOpenFileEx.o \
-           src/SFilePatchArchives.o \
-           src/SFileReadFile.o \
-           src/SFileVerify.o
+OBJS_CPP  = src/adpcm/adpcm.o \
+            src/huffman/huff.o \
+            src/sparse/sparse.o \
+            src/FileStream.o \
+            src/SBaseCommon.o \
+            src/SBaseDumpData.o \
+            src/SBaseFileTable.o \
+            src/SBaseSubTypes.o \
+            src/SCompression.o \
+            src/SFileAddFile.o \
+            src/SFileAttributes.o \
+            src/SFileCompactArchive.o \
+            src/SFileCreateArchive.o \
+            src/SFileExtractFile.o \
+            src/SFileFindFile.o \
+            src/SFileGetFileInfo.o \
+            src/SFileListFile.o \
+            src/SFileOpenArchive.o \
+            src/SFileOpenFileEx.o \
+            src/SFilePatchArchives.o \
+            src/SFileReadFile.o \
+            src/SFileVerify.o
               
 
-OBJS_C   = src/bzip2/blocksort.o \
-           src/bzip2/bzlib.o \
-           src/bzip2/compress.o \
-           src/bzip2/crctable.o \
-           src/bzip2/decompress.o \
-           src/bzip2/huffman.o \
-           src/bzip2/randtable.o \
-           src/jenkins/lookup3.o \
-           src/libtomcrypt/src/hashes/hash_memory.o \
-           src/libtomcrypt/src/hashes/md5.o \
-           src/libtomcrypt/src/hashes/sha1.o\
-           src/libtomcrypt/src/math/ltm_desc.o \
-           src/libtomcrypt/src/math/multi.o \
-           src/libtomcrypt/src/math/rand_prime.o \
-           src/libtomcrypt/src/misc/base64_decode.o \
-           src/libtomcrypt/src/misc/crypt_argchk.o \
-           src/libtomcrypt/src/misc/crypt_find_hash.o \
-           src/libtomcrypt/src/misc/crypt_find_prng.o \
-           src/libtomcrypt/src/misc/crypt_hash_descriptor.o \
-           src/libtomcrypt/src/misc/crypt_hash_is_valid.o \
-           src/libtomcrypt/src/misc/crypt_libc.o \
-           src/libtomcrypt/src/misc/crypt_ltc_mp_descriptor.o \
-           src/libtomcrypt/src/misc/crypt_prng_descriptor.o \
-           src/libtomcrypt/src/misc/crypt_prng_is_valid.o \
-           src/libtomcrypt/src/misc/crypt_register_hash.o \
-           src/libtomcrypt/src/misc/crypt_register_prng.o \
-           src/libtomcrypt/src/misc/zeromem.o \
-           src/libtomcrypt/src/pk/asn1/der_decode_bit_string.o \
-           src/libtomcrypt/src/pk/asn1/der_decode_boolean.o \
-           src/libtomcrypt/src/pk/asn1/der_decode_choice.o \
-           src/libtomcrypt/src/pk/asn1/der_decode_ia5_string.o \
-           src/libtomcrypt/src/pk/asn1/der_decode_integer.o \
-           src/libtomcrypt/src/pk/asn1/der_decode_object_identifier.o \
-           src/libtomcrypt/src/pk/asn1/der_decode_octet_string.o \
-           src/libtomcrypt/src/pk/asn1/der_decode_printable_string.o \
-           src/libtomcrypt/src/pk/asn1/der_decode_sequence_ex.o \
-           src/libtomcrypt/src/pk/asn1/der_decode_sequence_flexi.o \
-           src/libtomcrypt/src/pk/asn1/der_decode_sequence_multi.o \
-           src/libtomcrypt/src/pk/asn1/der_decode_short_integer.o \
-           src/libtomcrypt/src/pk/asn1/der_decode_utctime.o \
-           src/libtomcrypt/src/pk/asn1/der_decode_utf8_string.o \
-           src/libtomcrypt/src/pk/asn1/der_length_bit_string.o \
-           src/libtomcrypt/src/pk/asn1/der_length_boolean.o \
-           src/libtomcrypt/src/pk/asn1/der_length_ia5_string.o \
-           src/libtomcrypt/src/pk/asn1/der_length_integer.o \
-           src/libtomcrypt/src/pk/asn1/der_length_object_identifier.o \
-           src/libtomcrypt/src/pk/asn1/der_length_octet_string.o \
-           src/libtomcrypt/src/pk/asn1/der_length_printable_string.o \
-           src/libtomcrypt/src/pk/asn1/der_length_sequence.o \
-           src/libtomcrypt/src/pk/asn1/der_length_short_integer.o \
-           src/libtomcrypt/src/pk/asn1/der_length_utctime.o \
-           src/libtomcrypt/src/pk/asn1/der_length_utf8_string.o \
-           src/libtomcrypt/src/pk/asn1/der_sequence_free.o \
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_map.o \
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_mul2add.o \
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_mulmod.o \
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_points.o \
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_add_point.o \
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_dbl_point.o \
-           src/libtomcrypt/src/pk/pkcs1/pkcs_1_mgf1.o \
-           src/libtomcrypt/src/pk/pkcs1/pkcs_1_oaep_decode.o \
-           src/libtomcrypt/src/pk/pkcs1/pkcs_1_pss_decode.o \
-           src/libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_decode.o \
-           src/libtomcrypt/src/pk/rsa/rsa_exptmod.o \
-           src/libtomcrypt/src/pk/rsa/rsa_free.o \
-           src/libtomcrypt/src/pk/rsa/rsa_import.o \
-           src/libtomcrypt/src/pk/rsa/rsa_make_key.o \
-           src/libtomcrypt/src/pk/rsa/rsa_verify_hash.o \
-           src/libtomcrypt/src/pk/rsa/rsa_verify_simple.o \
-           src/libtommath/bncore.o \
-           src/libtommath/bn_fast_mp_invmod.o \
-           src/libtommath/bn_fast_mp_montgomery_reduce.o \
-           src/libtommath/bn_fast_s_mp_mul_digs.o \
-           src/libtommath/bn_fast_s_mp_mul_high_digs.o \
-           src/libtommath/bn_fast_s_mp_sqr.o \
-           src/libtommath/bn_mp_2expt.o \
-           src/libtommath/bn_mp_abs.o \
-           src/libtommath/bn_mp_add.o \
-           src/libtommath/bn_mp_addmod.o \
-           src/libtommath/bn_mp_add_d.o \
-           src/libtommath/bn_mp_and.o \
-           src/libtommath/bn_mp_clamp.o \
-           src/libtommath/bn_mp_clear.o \
-           src/libtommath/bn_mp_clear_multi.o \
-           src/libtommath/bn_mp_cmp.o \
-           src/libtommath/bn_mp_cmp_d.o \
-           src/libtommath/bn_mp_cmp_mag.o \
-           src/libtommath/bn_mp_cnt_lsb.o \
-           src/libtommath/bn_mp_copy.o \
-           src/libtommath/bn_mp_count_bits.o \
-           src/libtommath/bn_mp_div.o \
-           src/libtommath/bn_mp_div_2.o \
-           src/libtommath/bn_mp_div_2d.o \
-           src/libtommath/bn_mp_div_3.o \
-           src/libtommath/bn_mp_div_d.o \
-           src/libtommath/bn_mp_dr_is_modulus.o \
-           src/libtommath/bn_mp_dr_reduce.o \
-           src/libtommath/bn_mp_dr_setup.o \
-           src/libtommath/bn_mp_exch.o \
-           src/libtommath/bn_mp_exptmod.o \
-           src/libtommath/bn_mp_exptmod_fast.o \
-           src/libtommath/bn_mp_expt_d.o \
-           src/libtommath/bn_mp_exteuclid.o \
-           src/libtommath/bn_mp_fread.o \
-           src/libtommath/bn_mp_fwrite.o \
-           src/libtommath/bn_mp_gcd.o \
-           src/libtommath/bn_mp_get_int.o \
-           src/libtommath/bn_mp_grow.o \
-           src/libtommath/bn_mp_init.o \
-           src/libtommath/bn_mp_init_copy.o \
-           src/libtommath/bn_mp_init_multi.o \
-           src/libtommath/bn_mp_init_set.o \
-           src/libtommath/bn_mp_init_set_int.o \
-           src/libtommath/bn_mp_init_size.o \
-           src/libtommath/bn_mp_invmod.o \
-           src/libtommath/bn_mp_invmod_slow.o \
-           src/libtommath/bn_mp_is_square.o \
-           src/libtommath/bn_mp_jacobi.o \
-           src/libtommath/bn_mp_karatsuba_mul.o \
-           src/libtommath/bn_mp_karatsuba_sqr.o \
-           src/libtommath/bn_mp_lcm.o \
-           src/libtommath/bn_mp_lshd.o \
-           src/libtommath/bn_mp_mod.o \
-           src/libtommath/bn_mp_mod_2d.o \
-           src/libtommath/bn_mp_mod_d.o \
-           src/libtommath/bn_mp_montgomery_calc_normalization.o \
-           src/libtommath/bn_mp_montgomery_reduce.o \
-           src/libtommath/bn_mp_montgomery_setup.o \
-           src/libtommath/bn_mp_mul.o \
-           src/libtommath/bn_mp_mulmod.o \
-           src/libtommath/bn_mp_mul_2.o \
-           src/libtommath/bn_mp_mul_2d.o \
-           src/libtommath/bn_mp_mul_d.o \
-           src/libtommath/bn_mp_neg.o \
-           src/libtommath/bn_mp_n_root.o \
-           src/libtommath/bn_mp_or.o \
-           src/libtommath/bn_mp_prime_fermat.o \
-           src/libtommath/bn_mp_prime_is_divisible.o \
-           src/libtommath/bn_mp_prime_is_prime.o \
-           src/libtommath/bn_mp_prime_miller_rabin.o \
-           src/libtommath/bn_mp_prime_next_prime.o \
-           src/libtommath/bn_mp_prime_rabin_miller_trials.o \
-           src/libtommath/bn_mp_prime_random_ex.o \
-           src/libtommath/bn_mp_radix_size.o \
-           src/libtommath/bn_mp_radix_smap.o \
-           src/libtommath/bn_mp_rand.o \
-           src/libtommath/bn_mp_read_radix.o \
-           src/libtommath/bn_mp_read_signed_bin.o \
-           src/libtommath/bn_mp_read_unsigned_bin.o \
-           src/libtommath/bn_mp_reduce.o \
-           src/libtommath/bn_mp_reduce_2k.o \
-           src/libtommath/bn_mp_reduce_2k_l.o \
-           src/libtommath/bn_mp_reduce_2k_setup.o \
-           src/libtommath/bn_mp_reduce_2k_setup_l.o \
-           src/libtommath/bn_mp_reduce_is_2k.o \
-           src/libtommath/bn_mp_reduce_is_2k_l.o \
-           src/libtommath/bn_mp_reduce_setup.o \
-           src/libtommath/bn_mp_rshd.o \
-           src/libtommath/bn_mp_set.o \
-           src/libtommath/bn_mp_set_int.o \
-           src/libtommath/bn_mp_shrink.o \
-           src/libtommath/bn_mp_signed_bin_size.o \
-           src/libtommath/bn_mp_sqr.o \
-           src/libtommath/bn_mp_sqrmod.o \
-           src/libtommath/bn_mp_sqrt.o \
-           src/libtommath/bn_mp_sub.o \
-           src/libtommath/bn_mp_submod.o \
-           src/libtommath/bn_mp_sub_d.o \
-           src/libtommath/bn_mp_toom_mul.o \
-           src/libtommath/bn_mp_toom_sqr.o \
-           src/libtommath/bn_mp_toradix.o \
-           src/libtommath/bn_mp_toradix_n.o \
-           src/libtommath/bn_mp_to_signed_bin.o \
-           src/libtommath/bn_mp_to_signed_bin_n.o \
-           src/libtommath/bn_mp_to_unsigned_bin.o \
-           src/libtommath/bn_mp_to_unsigned_bin_n.o \
-           src/libtommath/bn_mp_unsigned_bin_size.o \
-           src/libtommath/bn_mp_xor.o \
-           src/libtommath/bn_mp_zero.o \
-           src/libtommath/bn_prime_tab.o \
-           src/libtommath/bn_reverse.o \
-           src/libtommath/bn_s_mp_add.o \
-           src/libtommath/bn_s_mp_exptmod.o \
-           src/libtommath/bn_s_mp_mul_digs.o \
-           src/libtommath/bn_s_mp_mul_high_digs.o \
-           src/libtommath/bn_s_mp_sqr.o \
-           src/libtommath/bn_s_mp_sub.o \
-           src/lzma/C/LzFind.o \
-           src/lzma/C/LzmaDec.o \
-           src/lzma/C/LzmaEnc.o \
-           src/pklib/explode.o \
-           src/pklib/implode.o \
-           src/zlib/adler32.o \
-           src/zlib/compress.o \
-           src/zlib/crc32.o \
-           src/zlib/deflate.o \
-           src/zlib/inffast.o \
-           src/zlib/inflate.o \
-           src/zlib/inftrees.o \
-           src/zlib/trees.o \
-           src/zlib/zutil.o \
-           stormlib_dll/DllMain.o
+OBJS_C    = src/bzip2/blocksort.o \
+            src/bzip2/bzlib.o \
+            src/bzip2/compress.o \
+            src/bzip2/crctable.o \
+            src/bzip2/decompress.o \
+            src/bzip2/huffman.o \
+            src/bzip2/randtable.o \
+            src/jenkins/lookup3.o \
+            src/libtomcrypt/src/hashes/hash_memory.o \
+            src/libtomcrypt/src/hashes/md5.o \
+            src/libtomcrypt/src/hashes/sha1.o\
+            src/libtomcrypt/src/math/ltm_desc.o \
+            src/libtomcrypt/src/math/multi.o \
+            src/libtomcrypt/src/math/rand_prime.o \
+            src/libtomcrypt/src/misc/base64_decode.o \
+            src/libtomcrypt/src/misc/crypt_argchk.o \
+            src/libtomcrypt/src/misc/crypt_find_hash.o \
+            src/libtomcrypt/src/misc/crypt_find_prng.o \
+            src/libtomcrypt/src/misc/crypt_hash_descriptor.o \
+            src/libtomcrypt/src/misc/crypt_hash_is_valid.o \
+            src/libtomcrypt/src/misc/crypt_libc.o \
+            src/libtomcrypt/src/misc/crypt_ltc_mp_descriptor.o \
+            src/libtomcrypt/src/misc/crypt_prng_descriptor.o \
+            src/libtomcrypt/src/misc/crypt_prng_is_valid.o \
+            src/libtomcrypt/src/misc/crypt_register_hash.o \
+            src/libtomcrypt/src/misc/crypt_register_prng.o \
+            src/libtomcrypt/src/misc/zeromem.o \
+            src/libtomcrypt/src/pk/asn1/der_decode_bit_string.o \
+            src/libtomcrypt/src/pk/asn1/der_decode_boolean.o \
+            src/libtomcrypt/src/pk/asn1/der_decode_choice.o \
+            src/libtomcrypt/src/pk/asn1/der_decode_ia5_string.o \
+            src/libtomcrypt/src/pk/asn1/der_decode_integer.o \
+            src/libtomcrypt/src/pk/asn1/der_decode_object_identifier.o \
+            src/libtomcrypt/src/pk/asn1/der_decode_octet_string.o \
+            src/libtomcrypt/src/pk/asn1/der_decode_printable_string.o \
+            src/libtomcrypt/src/pk/asn1/der_decode_sequence_ex.o \
+            src/libtomcrypt/src/pk/asn1/der_decode_sequence_flexi.o \
+            src/libtomcrypt/src/pk/asn1/der_decode_sequence_multi.o \
+            src/libtomcrypt/src/pk/asn1/der_decode_short_integer.o \
+            src/libtomcrypt/src/pk/asn1/der_decode_utctime.o \
+            src/libtomcrypt/src/pk/asn1/der_decode_utf8_string.o \
+            src/libtomcrypt/src/pk/asn1/der_length_bit_string.o \
+            src/libtomcrypt/src/pk/asn1/der_length_boolean.o \
+            src/libtomcrypt/src/pk/asn1/der_length_ia5_string.o \
+            src/libtomcrypt/src/pk/asn1/der_length_integer.o \
+            src/libtomcrypt/src/pk/asn1/der_length_object_identifier.o \
+            src/libtomcrypt/src/pk/asn1/der_length_octet_string.o \
+            src/libtomcrypt/src/pk/asn1/der_length_printable_string.o \
+            src/libtomcrypt/src/pk/asn1/der_length_sequence.o \
+            src/libtomcrypt/src/pk/asn1/der_length_short_integer.o \
+            src/libtomcrypt/src/pk/asn1/der_length_utctime.o \
+            src/libtomcrypt/src/pk/asn1/der_length_utf8_string.o \
+            src/libtomcrypt/src/pk/asn1/der_sequence_free.o \
+            src/libtomcrypt/src/pk/ecc/ltc_ecc_map.o \
+            src/libtomcrypt/src/pk/ecc/ltc_ecc_mul2add.o \
+            src/libtomcrypt/src/pk/ecc/ltc_ecc_mulmod.o \
+            src/libtomcrypt/src/pk/ecc/ltc_ecc_points.o \
+            src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_add_point.o \
+            src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_dbl_point.o \
+            src/libtomcrypt/src/pk/pkcs1/pkcs_1_mgf1.o \
+            src/libtomcrypt/src/pk/pkcs1/pkcs_1_oaep_decode.o \
+            src/libtomcrypt/src/pk/pkcs1/pkcs_1_pss_decode.o \
+            src/libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_decode.o \
+            src/libtomcrypt/src/pk/rsa/rsa_exptmod.o \
+            src/libtomcrypt/src/pk/rsa/rsa_free.o \
+            src/libtomcrypt/src/pk/rsa/rsa_import.o \
+            src/libtomcrypt/src/pk/rsa/rsa_make_key.o \
+            src/libtomcrypt/src/pk/rsa/rsa_verify_hash.o \
+            src/libtomcrypt/src/pk/rsa/rsa_verify_simple.o \
+            src/libtommath/bncore.o \
+            src/libtommath/bn_fast_mp_invmod.o \
+            src/libtommath/bn_fast_mp_montgomery_reduce.o \
+            src/libtommath/bn_fast_s_mp_mul_digs.o \
+            src/libtommath/bn_fast_s_mp_mul_high_digs.o \
+            src/libtommath/bn_fast_s_mp_sqr.o \
+            src/libtommath/bn_mp_2expt.o \
+            src/libtommath/bn_mp_abs.o \
+            src/libtommath/bn_mp_add.o \
+            src/libtommath/bn_mp_addmod.o \
+            src/libtommath/bn_mp_add_d.o \
+            src/libtommath/bn_mp_and.o \
+            src/libtommath/bn_mp_clamp.o \
+            src/libtommath/bn_mp_clear.o \
+            src/libtommath/bn_mp_clear_multi.o \
+            src/libtommath/bn_mp_cmp.o \
+            src/libtommath/bn_mp_cmp_d.o \
+            src/libtommath/bn_mp_cmp_mag.o \
+            src/libtommath/bn_mp_cnt_lsb.o \
+            src/libtommath/bn_mp_copy.o \
+            src/libtommath/bn_mp_count_bits.o \
+            src/libtommath/bn_mp_div.o \
+            src/libtommath/bn_mp_div_2.o \
+            src/libtommath/bn_mp_div_2d.o \
+            src/libtommath/bn_mp_div_3.o \
+            src/libtommath/bn_mp_div_d.o \
+            src/libtommath/bn_mp_dr_is_modulus.o \
+            src/libtommath/bn_mp_dr_reduce.o \
+            src/libtommath/bn_mp_dr_setup.o \
+            src/libtommath/bn_mp_exch.o \
+            src/libtommath/bn_mp_exptmod.o \
+            src/libtommath/bn_mp_exptmod_fast.o \
+            src/libtommath/bn_mp_expt_d.o \
+            src/libtommath/bn_mp_exteuclid.o \
+            src/libtommath/bn_mp_fread.o \
+            src/libtommath/bn_mp_fwrite.o \
+            src/libtommath/bn_mp_gcd.o \
+            src/libtommath/bn_mp_get_int.o \
+            src/libtommath/bn_mp_grow.o \
+            src/libtommath/bn_mp_init.o \
+            src/libtommath/bn_mp_init_copy.o \
+            src/libtommath/bn_mp_init_multi.o \
+            src/libtommath/bn_mp_init_set.o \
+            src/libtommath/bn_mp_init_set_int.o \
+            src/libtommath/bn_mp_init_size.o \
+            src/libtommath/bn_mp_invmod.o \
+            src/libtommath/bn_mp_invmod_slow.o \
+            src/libtommath/bn_mp_is_square.o \
+            src/libtommath/bn_mp_jacobi.o \
+            src/libtommath/bn_mp_karatsuba_mul.o \
+            src/libtommath/bn_mp_karatsuba_sqr.o \
+            src/libtommath/bn_mp_lcm.o \
+            src/libtommath/bn_mp_lshd.o \
+            src/libtommath/bn_mp_mod.o \
+            src/libtommath/bn_mp_mod_2d.o \
+            src/libtommath/bn_mp_mod_d.o \
+            src/libtommath/bn_mp_montgomery_calc_normalization.o \
+            src/libtommath/bn_mp_montgomery_reduce.o \
+            src/libtommath/bn_mp_montgomery_setup.o \
+            src/libtommath/bn_mp_mul.o \
+            src/libtommath/bn_mp_mulmod.o \
+            src/libtommath/bn_mp_mul_2.o \
+            src/libtommath/bn_mp_mul_2d.o \
+            src/libtommath/bn_mp_mul_d.o \
+            src/libtommath/bn_mp_neg.o \
+            src/libtommath/bn_mp_n_root.o \
+            src/libtommath/bn_mp_or.o \
+            src/libtommath/bn_mp_prime_fermat.o \
+            src/libtommath/bn_mp_prime_is_divisible.o \
+            src/libtommath/bn_mp_prime_is_prime.o \
+            src/libtommath/bn_mp_prime_miller_rabin.o \
+            src/libtommath/bn_mp_prime_next_prime.o \
+            src/libtommath/bn_mp_prime_rabin_miller_trials.o \
+            src/libtommath/bn_mp_prime_random_ex.o \
+            src/libtommath/bn_mp_radix_size.o \
+            src/libtommath/bn_mp_radix_smap.o \
+            src/libtommath/bn_mp_rand.o \
+            src/libtommath/bn_mp_read_radix.o \
+            src/libtommath/bn_mp_read_signed_bin.o \
+            src/libtommath/bn_mp_read_unsigned_bin.o \
+            src/libtommath/bn_mp_reduce.o \
+            src/libtommath/bn_mp_reduce_2k.o \
+            src/libtommath/bn_mp_reduce_2k_l.o \
+            src/libtommath/bn_mp_reduce_2k_setup.o \
+            src/libtommath/bn_mp_reduce_2k_setup_l.o \
+            src/libtommath/bn_mp_reduce_is_2k.o \
+            src/libtommath/bn_mp_reduce_is_2k_l.o \
+            src/libtommath/bn_mp_reduce_setup.o \
+            src/libtommath/bn_mp_rshd.o \
+            src/libtommath/bn_mp_set.o \
+            src/libtommath/bn_mp_set_int.o \
+            src/libtommath/bn_mp_shrink.o \
+            src/libtommath/bn_mp_signed_bin_size.o \
+            src/libtommath/bn_mp_sqr.o \
+            src/libtommath/bn_mp_sqrmod.o \
+            src/libtommath/bn_mp_sqrt.o \
+            src/libtommath/bn_mp_sub.o \
+            src/libtommath/bn_mp_submod.o \
+            src/libtommath/bn_mp_sub_d.o \
+            src/libtommath/bn_mp_toom_mul.o \
+            src/libtommath/bn_mp_toom_sqr.o \
+            src/libtommath/bn_mp_toradix.o \
+            src/libtommath/bn_mp_toradix_n.o \
+            src/libtommath/bn_mp_to_signed_bin.o \
+            src/libtommath/bn_mp_to_signed_bin_n.o \
+            src/libtommath/bn_mp_to_unsigned_bin.o \
+            src/libtommath/bn_mp_to_unsigned_bin_n.o \
+            src/libtommath/bn_mp_unsigned_bin_size.o \
+            src/libtommath/bn_mp_xor.o \
+            src/libtommath/bn_mp_zero.o \
+            src/libtommath/bn_prime_tab.o \
+            src/libtommath/bn_reverse.o \
+            src/libtommath/bn_s_mp_add.o \
+            src/libtommath/bn_s_mp_exptmod.o \
+            src/libtommath/bn_s_mp_mul_digs.o \
+            src/libtommath/bn_s_mp_mul_high_digs.o \
+            src/libtommath/bn_s_mp_sqr.o \
+            src/libtommath/bn_s_mp_sub.o \
+            src/lzma/C/LzFind.o \
+            src/lzma/C/LzmaDec.o \
+            src/lzma/C/LzmaEnc.o \
+            src/pklib/explode.o \
+            src/pklib/implode.o \
+            src/zlib/adler32.o \
+            src/zlib/compress.o \
+            src/zlib/crc32.o \
+            src/zlib/deflate.o \
+            src/zlib/inffast.o \
+            src/zlib/inflate.o \
+            src/zlib/inftrees.o \
+            src/zlib/trees.o \
+            src/zlib/zutil.o
+            
+OBJS_DLL  = stormlib_dll/DllMain.o
 
-all: $(LIBRARY)
+OBJS_TEST = test/test.o
+
+all: $(LIBRARY) $(TESTEXE)
 
 #clean:
 #   rm -f $(OBJS) $(LIBRARY)
@@ -259,9 +261,11 @@ all: $(LIBRARY)
 #   cp StormLib.h /usr/local/include/StormLib
 #   cp StormPort.h /usr/local/include/StormLib
 
-$(LIBRARY): $(OBJS_C) $(OBJS_CPP)
-	$(CPP) $(CFLAGS) $(DFLAGS) -o $(LIBRARY) $(OBJS_C) $(OBJS_CPP)  $(LFLAGS)  
-	$(AR) $(ARFLAGS) $(LIBRARY) $(OBJS_C) $(OBJS_CPP)
+$(LIBRARY): $(OBJS_C) $(OBJS_CPP) $(OBJS_DLL)
+	$(CPP) $(CFLAGS) $(DFLAGS) -o $(LIBRARY) $(OBJS_C) $(OBJS_CPP) $(OBJS_DLL) $(DLLLFLAGS)
+
+$(TESTEXE): $(OBJS_C) $(OBJS_CPP) $(OBJS_TEST)
+	$(CPP) $(CFLAGS) $(DFLAGS) -o "$@" $(OBJS_C) $(OBJS_CPP) $(OBJS_TEST) $(EXELFLAGS)
 
 $(OBJS_C): %.o: %.c
 	$(CC) -o $@ $(CFLAGS) $(DFLAGS) -c $<
@@ -269,3 +273,9 @@ $(OBJS_C): %.o: %.c
 $(OBJS_CPP): %.o: %.cpp
 	$(CC) -o $@ $(CFLAGS) $(DFLAGS) -c $<
 
+$(OBJS_DLL): %.o: %.c
+	$(CC) -o $@ $(CFLAGS) $(DFLAGS) -c $<
+
+$(OBJS_TEST): %.o: %.cpp
+	$(CPP) -o $@ $(CFLAGS) $(DFLAGS) -c $<
+
diff --git a/src/FileStream.cpp b/src/FileStream.cpp
index 9cea184..62de5b4 100644
--- a/src/FileStream.cpp
+++ b/src/FileStream.cpp
@@ -734,7 +734,7 @@ static bool BaseHttp_Read(
         {
             // Add range request to the HTTP headers
             // http://www.clevercomponents.com/articles/article015/resuming.asp
-            _stprintf(szRangeRequest, _T("Range: bytes=%d-%d"), dwStartOffset, dwEndOffset);
+            _stprintf(szRangeRequest, _T("Range: bytes=%u-%u"), (unsigned int)dwStartOffset, (unsigned int)dwEndOffset);
             HttpAddRequestHeaders(hRequest, szRangeRequest, 0xFFFFFFFF, HTTP_ADDREQ_FLAG_ADD_IF_NEW); 
 
             // Send the request to the server
@@ -1669,7 +1669,7 @@ static void PartStream_Close(TBlockStream * pStream)
         
         // Make sure that the header is properly BSWAPed
         BSWAP_ARRAY32_UNSIGNED(&PartHeader, sizeof(PART_FILE_HEADER));
-        sprintf(PartHeader.GameBuildNumber, "%u", pStream->BuildNumber);
+        sprintf(PartHeader.GameBuildNumber, "%u", (unsigned int)pStream->BuildNumber);
 
         // Write the part header
         pStream->BaseWrite(pStream, &ByteOffset, &PartHeader, sizeof(PART_FILE_HEADER));
diff --git a/src/SFileFindFile.cpp b/src/SFileFindFile.cpp
index 21c9499..42f5380 100644
--- a/src/SFileFindFile.cpp
+++ b/src/SFileFindFile.cpp
@@ -289,7 +289,7 @@ static int DoMPQSearch(TMPQSearch * hs, SFILE_FIND_DATA * lpFindFileData)
                     {
                         // Open the file by its pseudo-name.
                         // This also generates the file name with a proper extension
-                        sprintf(szPseudoName, "File%08u.xxx", dwBlockIndex);
+                        sprintf(szPseudoName, "File%08u.xxx", (unsigned int)dwBlockIndex);
                         if(SFileOpenFileEx((HANDLE)hs->ha, szPseudoName, SFILE_OPEN_BASE_FILE, &hFile))
                         {
                             szFileName = (pFileEntry->szFileName != NULL) ? pFileEntry->szFileName : szPseudoName;
diff --git a/src/StormPort.h b/src/StormPort.h
index 218d5cf..902b785 100644
--- a/src/StormPort.h
+++ b/src/StormPort.h
@@ -270,7 +270,11 @@
     #define STORMLIB_DEPRECATED(_Text) __declspec(deprecated)
   #endif
 #else
-  #define STORMLIB_DEPRECATED(_Text) __attribute__((deprecated(_Text)))
+  #ifdef __GNUC__
+    #define STORMLIB_DEPRECATED(_Text) __attribute__((deprecated))
+  #else
+    #define STORMLIB_DEPRECATED(_Text) __attribute__((deprecated(_Text)))
+  #endif
 #endif
 
 // When a flag is deprecated, use this macro
diff --git a/src/adpcm/adpcm.cpp b/src/adpcm/adpcm.cpp
index d05fca6..7805dc5 100644
--- a/src/adpcm/adpcm.cpp
+++ b/src/adpcm/adpcm.cpp
@@ -79,7 +79,7 @@ class TADPCMStream
     bool ReadWordSample(short & OneSample)
     {
         // Check if we have enough space in the output buffer
-        if((pbBufferEnd - pbBuffer) < sizeof(short))
+        if((size_t)(pbBufferEnd - pbBuffer) < sizeof(short))
             return false;
 
         // Write the sample
@@ -91,7 +91,7 @@ class TADPCMStream
     bool WriteWordSample(short OneSample)
     {
         // Check if we have enough space in the output buffer
-        if((pbBufferEnd - pbBuffer) < sizeof(short))
+        if((size_t)(pbBufferEnd - pbBuffer) < sizeof(short))
             return false;
 
         // Write the sample
diff --git a/src/sparse/sparse.cpp b/src/sparse/sparse.cpp
index dd65c82..dc988ba 100644
--- a/src/sparse/sparse.cpp
+++ b/src/sparse/sparse.cpp
@@ -260,7 +260,7 @@ int DecompressSparse(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer,
     cbOutBuffer |= (OneByte << 0x00);
 
     // Verify the size of the stream against the output buffer size
-    if(cbOutBuffer > *pcbOutBuffer)
+    if(cbOutBuffer > (unsigned int)*pcbOutBuffer)
         return 0;
 
     // Put the output size to the buffer
diff --git a/test/TLogHelper.cpp b/test/TLogHelper.cpp
index 1e0c787..6876637 100644
--- a/test/TLogHelper.cpp
+++ b/test/TLogHelper.cpp
@@ -287,7 +287,7 @@ int TLogHelper::PrintWithClreol(const char * szFormat, va_list argList, bool bPr
         bMessagePrinted = true;
 
     // Spit out the text in one single printf
-    printf("%s", szMessage, 0);
+    printf("%s", szMessage);
     return nError;
 }
 
diff --git a/test/Test.cpp b/test/Test.cpp
index 25f63fb..7c50b4b 100644
--- a/test/Test.cpp
+++ b/test/Test.cpp
@@ -2820,7 +2820,7 @@ static int TestCreateArchive_FillArchive(const char * szPlainName)
     // Now we should be able to add 6 files
     if(nError == ERROR_SUCCESS)
     {
-        for(DWORD i = 0; i < dwMaxFileCount; i++)
+        for(unsigned int i = 0; i < dwMaxFileCount; i++)
         {
             sprintf(szFileName, "AddedFile%03u.txt", i);
             nError = AddFileToMpq(&Logger, hMpq, szFileName, szFileData, dwFlags, dwCompression);
@@ -2922,7 +2922,7 @@ static int TestCreateArchive_IncMaxFileCount(const char * szPlainName)
     // we increment the max file count
     if(nError == ERROR_SUCCESS)
     {
-        for(DWORD i = 0; i < 10; i++)
+        for(unsigned int i = 0; i < 10; i++)
         {
             // Open the archive again
             nError = OpenExistingArchiveWithCopy(&Logger, NULL, szPlainName, &hMpq);
@@ -3154,7 +3154,6 @@ static int TestCreateArchive_CompressionsTest(const char * szPlainName)
     DWORD dwCmprCount = sizeof(Compressions) / sizeof(DWORD);
     DWORD dwAddedFiles = 0;
     DWORD dwFoundFiles = 0;
-    DWORD i;
     int nError;
 
     // Create paths for local file to be added
@@ -3167,7 +3166,7 @@ static int TestCreateArchive_CompressionsTest(const char * szPlainName)
     if(nError == ERROR_SUCCESS)
     {
         Logger.UserTotal = dwCmprCount;
-        for(i = 0; i < dwCmprCount; i++)
+        for(unsigned int i = 0; i < dwCmprCount; i++)
         {
             sprintf(szArchivedName, "WaveFile_%02u.wav", i + 1);
             nError = AddLocalFileToMpq(&Logger, hMpq, szArchivedName, szFileName, MPQ_FILE_COMPRESS | MPQ_FILE_ENCRYPTED | MPQ_FILE_SECTOR_CRC, Compressions[i]);