hmm... trying again to get everything committed

2 files changed, 123 insertions, 0 deletions

diff --git a/libraries/openjpeg-libsl/Makefile b/libraries/openjpeg-libsl/Makefile
new file mode 100644
index 0000000..9912759
--- /dev/null
+++ b/libraries/openjpeg-libsl/Makefile
@@ -0,0 +1,66 @@
+# Linux makefile for OpenJPEG
+
+VER_MAJOR = 2
+VER_MINOR = 1.2.0
+
+SRCS = ./libopenjpeg/bio.c ./libopenjpeg/cio.c ./libopenjpeg/dwt.c ./libopenjpeg/event.c ./libopenjpeg/image.c ./libopenjpeg/j2k.c ./libopenjpeg/j2k_lib.c ./libopenjpeg/jp2.c ./libopenjpeg/jpt.c ./libopenjpeg/mct.c ./libopenjpeg/mqc.c ./libopenjpeg/openjpeg.c ./libopenjpeg/pi.c ./libopenjpeg/raw.c ./libopenjpeg/t1.c ./libopenjpeg/t2.c ./libopenjpeg/tcd.c ./libopenjpeg/tgt.c
+CPPSRCS = ./libsl/libsl.cpp
+INCLS = ./libopenjpeg/bio.h ./libopenjpeg/cio.h ./libopenjpeg/dwt.h ./libopenjpeg/event.h ./libopenjpeg/fix.h ./libopenjpeg/image.h ./libopenjpeg/int.h ./libopenjpeg/j2k.h ./libopenjpeg/j2k_lib.h ./libopenjpeg/jp2.h ./libopenjpeg/jpt.h ./libopenjpeg/mct.h ./libopenjpeg/mqc.h ./libopenjpeg/openjpeg.h ./libopenjpeg/pi.h ./libopenjpeg/raw.h ./libopenjpeg/t1.h ./libopenjpeg/t2.h ./libopenjpeg/tcd.h ./libopenjpeg/tgt.h ./libopenjpeg/opj_includes.h ./libsl/libsl.h
+INCLUDE = -Ilibopenjpeg
+
+# General configuration variables:
+CC = gcc
+AR = ar
+
+# Converts cr/lf to just lf
+DOS2UNIX = dos2unix
+
+COMPILERFLAGS = -O3 -fPIC
+LIBRARIES = -lstdc++
+
+MODULES = $(SRCS:.c=.o)
+CPPMODULES = $(CPPSRCS:.cpp=.o)
+CFLAGS = $(COMPILERFLAGS) $(INCLUDE)
+
+TARGET  = openjpeg-libsl
+SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so
+LIBNAME = lib$(TARGET).so.$(VER_MAJOR)
+
+
+default: all
+
+all: OpenJPEG
+
+dist: OpenJPEG
+        install -d ../bin
+        cp $(SHAREDLIB) ../bin/
+
+dos2unix:
+        @$(DOS2UNIX) $(SRCS) $(INCLS)
+
+OpenJPEG: $(SHAREDLIB)
+
+$(MODULES): %.o: %.c
+        $(CC) $(CFLAGS) -c $< -o $@
+
+$(CPPMODULES): %.o: %.cpp
+        $(CC) $(CFLAGS) -c $< -o $@
+
+$(SHAREDLIB): $(MODULES) $(CPPMODULES)
+        $(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(CPPMODULES) $(LIBRARIES)
+
+install: OpenJPEG
+        install -d ../bin
+        cp $(SHAREDLIB) ../bin/
+
+clean:
+        rm -rf core dist/ u2dtmp* $(MODULES) $(CPPMODULES) $(SHAREDLIB) $(LIBNAME)
+
+osx:
+        make -f Makefile.osx
+
+osxinstall:
+        make -f Makefile.osx install
+
+osxclean:
+        make -f Makefile.osx clean
\ No newline at end of file
diff --git a/libraries/openjpeg-libsl/Makefile.osx b/libraries/openjpeg-libsl/Makefile.osx
new file mode 100644
index 0000000..5d2a5c6
--- /dev/null
+++ b/libraries/openjpeg-libsl/Makefile.osx
@@ -0,0 +1,57 @@
+# MacOSX makefile for OpenJPEG
+
+VER_MAJOR = 2
+VER_MINOR = 1.2.0
+
+SRCS = ./libopenjpeg/bio.c ./libopenjpeg/cio.c ./libopenjpeg/dwt.c ./libopenjpeg/event.c ./libopenjpeg/image.c ./libopenjpeg/j2k.c ./libopenjpeg/j2k_lib.c ./libopenjpeg/jp2.c ./libopenjpeg/jpt.c ./libopenjpeg/mct.c ./libopenjpeg/mqc.c ./libopenjpeg/openjpeg.c ./libopenjpeg/pi.c ./libopenjpeg/raw.c ./libopenjpeg/t1.c ./libopenjpeg/t2.c ./libopenjpeg/tcd.c ./libopenjpeg/tgt.c
+CPPSRCS = ./libsl/libsl.cpp
+INCLS = ./libopenjpeg/bio.h ./libopenjpeg/cio.h ./libopenjpeg/dwt.h ./libopenjpeg/event.h ./libopenjpeg/fix.h ./libopenjpeg/image.h ./libopenjpeg/int.h ./libopenjpeg/j2k.h ./libopenjpeg/j2k_lib.h ./libopenjpeg/jp2.h ./libopenjpeg/jpt.h ./libopenjpeg/mct.h ./libopenjpeg/mqc.h ./libopenjpeg/openjpeg.h ./libopenjpeg/pi.h ./libopenjpeg/raw.h ./libopenjpeg/t1.h ./libopenjpeg/t2.h ./libopenjpeg/tcd.h ./libopenjpeg/tgt.h ./libopenjpeg/opj_includes.h ./libsl/libsl.h
+INCLUDE = -Ilibopenjpeg
+
+# General configuration variables:
+CC = gcc
+
+
+LIBTOOLSTAT = libtool
+LIBTOOLDYN = gcc
+
+COMPILERFLAGS = -O3 -fPIC
+LIBRARIES = -lstdc++
+
+MODULES = $(SRCS:.c=.o)
+CPPMODULES = $(CPPSRCS:.cpp=.o)
+CFLAGS = $(COMPILERFLAGS) $(INCLUDE)
+
+TARGET  = openjpeg-libsl
+SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).dylib
+LIBNAME = lib$(TARGET).dylib
+
+
+default: all
+
+all: OpenJPEG
+
+dist: OpenJPEG
+        install -d ../bin
+        cp $(SHAREDLIB) ../bin/
+
+dos2unix:
+        @$(DOS2UNIX) $(SRCS) $(INCLS)
+
+OpenJPEG: $(SHAREDLIB)
+
+.c.o:
+        $(CC) $(CFLAGS) -c $< -o $@
+
+.cpp.o:
+        $(CC) $(CFLAGS) -c $< -o $@
+
+$(SHAREDLIB): $(MODULES) $(CPPMODULES)
+        $(LIBTOOLDYN) -dynamiclib -o $@ $(MODULES) $(CPPMODULES) $(LIBRARIES)
+
+install:
+        install -d ../bin
+        cp $(SHAREDLIB) ../bin/
+
+clean:
+        rm -rf core dist/ u2dtmp* $(MODULES) $(CPPMODULES) $(SHAREDLIB) $(LIBNAME)