(svn r17216) -Update: MiniLZO from 1.08 to 2.03.

1 files changed, 79 insertions, 24 deletions

diff --git a/src/3rdparty/minilzo/Makefile b/src/3rdparty/minilzo/Makefile
index 92eba72ea..a6ee373e8 100644
--- a/src/3rdparty/minilzo/Makefile
+++ b/src/3rdparty/minilzo/Makefile
@@ -1,58 +1,113 @@
 #
 # a very simple Makefile for miniLZO
 #
-# Copyright (C) 1996-2002 Markus F.X.J. Oberhumer
+# Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
 #
 
+PROGRAM = testmini
 SOURCES = testmini.c minilzo.c
 
-default all:
+default:
 	@echo "Please choose one of the following targets:"
-	@echo "    gcc gcc-i386 gcc-rs6000"
-	@echo "    visualc watcomc watcomc16"
-	@echo "    hpux hpux9"
+	@echo "    gcc:   gcc"
+	@echo "    unix:  hpux hpux9"
+	@echo "    win32: win32-bc win32-cygwin win32-dm win32-lccwin32"
+	@echo "           win32-intelc win32-mingw win32-vc win32-watcomc"
+	@echo "    dos16: dos16-bc dos16-mc dos16-wc"
+	@echo "    dos32: dos32-djgpp2 dos32-wc"
+
+
+# Make sure that minilzo.h, lzoconf.h and lzodefs.h are in the
+# current dircectory. Otherwise you may want to adjust CPPFLAGS.
+##CPPFLAGS = -I../include/lzo -I.
+
+GCC_CFLAGS = -s -Wall -O2 -fomit-frame-pointer
 
 
 #
-# gcc
+# gcc (generic)
 #
+
 gcc:
-	gcc -Wall -O2 -s -o testmini $(SOURCES)
+	gcc $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM) $(SOURCES)
+
+cc:
+	cc $(CPPFLAGS) -o $(PROGRAM) $(SOURCES)
+
+
+#
+# UNIX
+#
+
+hpux:
+	cc -Ae $(CPPFLAGS) -o $(PROGRAM) $(SOURCES)
+
+hpux9:
+	cc -Aa -D_HPUX_SOURCE $(CPPFLAGS) -o $(PROGRAM) $(SOURCES)
+
 
-gcc-i386:
-	gcc -Wall -O2 -fomit-frame-pointer -fno-strength-reduce -s -o testmini $(SOURCES)
+#
+# Windows (32-bit)
+#
+
+win32-borlandc win32-bc:
+	bcc32 -O2 -d -w -w-aus $(CPPFLAGS) $(SOURCES)
+
+win32-cygwin32 win32-cygwin:
+	gcc -mcygwin $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM).exe $(SOURCES)
+
+win32-digitalmars win32-dm:
+	dmc -mn -o -w- $(CPPFLAGS) $(SOURCES)
+
+win32-intelc win32-ic:
+	icl -nologo -MD -W3 -O2 -GF $(CPPFLAGS) $(SOURCES)
+
+win32-lccwin32:
+	@echo "NOTE: need lcc 2002-07-25 or newer, older versions have bugs"
+	lc -A -unused -O $(CPPFLAGS) $(SOURCES)
+
+win32-mingw32 win32-mingw:
+	gcc -mno-cygwin $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM).exe $(SOURCES)
 
-gcc-rs6000:
-	gcc -Wall -O2 -fno-schedule-insns -fno-schedule-insns2 -o testmini $(SOURCES)
+win32-visualc win32-vc:
+	cl -nologo -MD -W3 -O2 -GF $(CPPFLAGS) $(SOURCES)
+
+win32-watcomc win32-wc:
+	wcl386 -bt=nt -zq -mf -5r -zc -w5 -oneatx $(CPPFLAGS) $(SOURCES)
 
 
 #
-# Windows
+# DOS (16-bit)
 #
-visualc:
-	cl -nologo -ML -W3 -O2 -GF $(SOURCES)
 
-watcomc:
-	wcl386 -zq -mf -5r -zc -wx -oneatx $(SOURCES)
+dos16-borlandc dos16-bc:
+	bcc -ml -w -d -O -4 $(CPPFLAGS) $(SOURCES)
+
+dos16-microsoftc dos16-msc dos16-mc:
+	cl -nologo -f- -AL -O -G2 -W3 $(CPPFLAGS) $(SOURCES)
 
-watcomc16:
-	wcl -zq -ml -5 -zc -wx -oneatx $(SOURCES)
+dos16-watcomc dos16-wc:
+	wcl -zq -ml -bt=dos -l=dos -ox -w5 $(CPPFLAGS) $(SOURCES)
 
 
 #
-# UNIX
+# DOS (32-bit)
 #
 
-hpux:
-	cc -Ae -o testmini $(SOURCES)
+dos32-djgpp2 dos32-dj2:
+	gcc $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM).exe $(SOURCES)
 
-hpux9:
-	cc -Aa -D_HPUX_SOURCE -o testmini $(SOURCES)
+dos32-watcomc dos32-wc:
+	wcl386 -zq -mf -bt=dos -l=dos4g -5r -ox -zc $(CPPFLAGS) $(SOURCES)
 
 
 #
 # other targets
 #
+
 clean:
-	rm -f testmini testmini.exe *.err *.o *.obj core
+	rm -f $(PROGRAM) $(PROGRAM).exe $(PROGRAM).map $(PROGRAM).tds
+	rm -f *.err *.o *.obj
+
+.PHONY: default clean