2004-10-05 Lutz Mueller <lutz@users.sourceforge.net>

	* contrib/watcom: Files contributed by Angela Wrobel.

diff --git a/ChangeLog b/ChangeLog
index 89830a7..226ffe8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-05  Lutz Mueller <lutz@users.sourceforge.net>
+
+       * contrib/watcom: Files contributed by Angela Wrobel.
+
 2004-10-04  Lutz Mueller <lutz@users.sourceforge.net>
 
        * libexif/exif-mem.h: Documentation.

diff --git a/contrib/watcom/Makefile.wat b/contrib/watcom/Makefile.wat
new file mode 100644 (file)
index 0000000..97fe94d
--- /dev/null
+++ b/contrib/watcom/Makefile.wat
@@ -0,0 +1,173 @@
+# This makefile is made for OpenWatcom/NT and runs on my system.\r
+# It should not be too hard to make it run on other systems, too.\r
+#\r
+# FIRST, rename libexif\_stdint_watcom.h to libexif\_stdint.h \r
+#\r
+# WARNING: there as no care been taken that the depencencies are\r
+# correct. This should be fixed in the future. Currently, this makefile\r
+# builds only, so after critical changes to the code, you should type\r
+# "wmake clean" before rebuilding. Sorry...\r
+#\r
+# WARNING: This makefile might run on your system, however, I made it\r
+# mainly for myself and don't want to waste my time to make it look "nice".\r
+#\r
+# WARNING: I used another makefile as template, so some things might be\r
+# thrown away. Don't hesitate to improve this makefile!\r
+#\r
+# LICENSE: no restrictions at all, but USE ON YOUR OWN RISK ONLY.\r
+#\r
+# USAGE: Simply type "wmake -f Makefile.wat" or\r
+#        rename "Makefile.wat" to "Makefile" and type "wmake"\r
+#\r
+#   Angela Wrobel <http://www.wrobelnet.de/>\r
+\r
+\r
+# Uncomment line for desired system\r
+#SYSTEM=DOS\r
+#SYSTEM=OS2\r
+SYSTEM=NT\r
+\r
+# The name of your C compiler:\r
+CC= wcl386\r
+\r
+# We're using similar constants like wxWidgets\r
+!ifeq FINAL 1\r
+OPTFLAGS= -5r -zp8 -otexan\r
+!else\r
+OPTFLAGS= -5r -od -d2\r
+!endif\r
+\r
+LIBEXIFDIR=libexif\r
+TESTEXIFDIR=test\r
+\r
+IFLAGS= -i=.\r
+WINVERFLAGS=\r
+EXTRACPPFLAGS=-dEXIF_DONT_CHANGE_MAKER_NOTE\r
+DEBUGCFLAGS=\r
+EXTRACFLAGS=\r
+OUTPUTDIR=$(LIBEXIFDIR)\r
+CPPFLAGS = /dWIN32 /bm /fo=$(OUTPUTDIR)\ /fr -zq $(IFLAGS) $(OPTFLAGS) $(WINVERFLAGS) $(EXTRACPPFLAGS)\r
+\r
+# zm and zv as well as the linker options below are used to make the resulting\r
+# .exe smaller\r
+CFLAGS = $(CPPFLAGS) $(DEBUGCFLAGS) $(EXTRACFLAGS) /zm\r
+\r
+# Link-time cc options:\r
+!ifeq SYSTEM DOS\r
+LDFLAGS= -zq -l=dos4g\r
+!else ifeq SYSTEM OS2\r
+LDFLAGS= -zq -l=os2v2\r
+!else ifeq SYSTEM NT\r
+LDFLAGS= -zq -l=nt\r
+!endif\r
+\r
+# End of configurable options.\r
+\r
+\r
+\r
+LIBOBJECTS = &\r
+       $(LIBEXIFDIR)\exif-byte-order.obj $(LIBEXIFDIR)\exif-content.obj &\r
+       $(LIBEXIFDIR)\exif-data.obj $(LIBEXIFDIR)\exif-entry.obj &\r
+       $(LIBEXIFDIR)\exif-format.obj $(LIBEXIFDIR)\exif-ifd.obj &\r
+       $(LIBEXIFDIR)\exif-loader.obj $(LIBEXIFDIR)\exif-log.obj &\r
+       $(LIBEXIFDIR)\exif-mnote-data.obj $(LIBEXIFDIR)\exif-tag.obj &\r
+        $(LIBEXIFDIR)\exif-utils.obj &\r
+       $(LIBEXIFDIR)\exif-mnote-data-olympus.obj &\r
+       $(LIBEXIFDIR)\mnote-olympus-entry.obj &\r
+       $(LIBEXIFDIR)\mnote-olympus-tag.obj &\r
+       $(LIBEXIFDIR)\exif-mnote-data-pentax.obj &\r
+       $(LIBEXIFDIR)\mnote-pentax-entry.obj &\r
+       $(LIBEXIFDIR)\mnote-pentax-tag.obj &\r
+       $(LIBEXIFDIR)\exif-mnote-data-canon.obj &\r
+       $(LIBEXIFDIR)\mnote-canon-entry.obj &\r
+       $(LIBEXIFDIR)\mnote-canon-tag.obj \r
+\r
+\r
+#CFLAGS = /dWIN32 /bm /fr -zq -i=. -5r -od -d2 /d2 /zm /fo=$(LIBEXIFDIR)\\r
+\r
+all : libexif.lib test-mem.exe test-mnote.exe test-value.exe\r
+#      test-tree.exe \r
+\r
+libexif.lib: $(LIBOBJECTS)\r
+       - del libexif.lib\r
+       * wlib -n libexif.lib $(LIBOBJECTS)\r
+\r
+$(LIBEXIFDIR)\exif-byte-order.obj : $(LIBEXIFDIR)\exif-byte-order.c\r
+       $(CC) -c $(CFLAGS) $[*  \r
+\r
+$(LIBEXIFDIR)\exif-content.obj : $(LIBEXIFDIR)\exif-content.c\r
+       $(CC) -c $(CFLAGS) $[*  \r
+\r
+$(LIBEXIFDIR)\exif-data.obj : $(LIBEXIFDIR)\exif-data.c\r
+       $(CC) -c $(CFLAGS) $[*  \r
+\r
+$(LIBEXIFDIR)\exif-entry.obj : $(LIBEXIFDIR)\exif-entry.c\r
+       $(CC) -c $(CFLAGS) $[*  \r
+\r
+$(LIBEXIFDIR)\exif-format.obj : $(LIBEXIFDIR)\exif-format.c\r
+       $(CC) -c $(CFLAGS) $[*  \r
+\r
+$(LIBEXIFDIR)\exif-ifd.obj : $(LIBEXIFDIR)\exif-ifd.c\r
+       $(CC) -c $(CFLAGS) $[*  \r
+\r
+$(LIBEXIFDIR)\exif-loader.obj : $(LIBEXIFDIR)\exif-loader.c\r
+       $(CC) -c $(CFLAGS) $[*  \r
+\r
+$(LIBEXIFDIR)\exif-log.obj : $(LIBEXIFDIR)\exif-log.c\r
+       $(CC) -c $(CFLAGS) $[*  \r
+\r
+$(LIBEXIFDIR)\exif-mnote-data.obj : $(LIBEXIFDIR)\exif-mnote-data.c\r
+       $(CC) -c $(CFLAGS) $[*  \r
+\r
+$(LIBEXIFDIR)\exif-tag.obj : $(LIBEXIFDIR)\exif-tag.c\r
+       $(CC) -c $(CFLAGS) $[*  \r
+\r
+$(LIBEXIFDIR)\exif-utils.obj : $(LIBEXIFDIR)\exif-utils.c\r
+       $(CC) -c $(CFLAGS) $[*  \r
+\r
+$(LIBEXIFDIR)\exif-mnote-data-olympus.obj : $(LIBEXIFDIR)\olympus\exif-mnote-data-olympus.c\r
+       $(CC) -c $(CFLAGS) $[*  \r
+\r
+$(LIBEXIFDIR)\mnote-olympus-entry.obj : $(LIBEXIFDIR)\olympus\mnote-olympus-entry.c\r
+       $(CC) -c $(CFLAGS) $[*  \r
+\r
+$(LIBEXIFDIR)\mnote-olympus-tag.obj : $(LIBEXIFDIR)\olympus\mnote-olympus-tag.c\r
+       $(CC) -c $(CFLAGS) $[*  \r
+\r
+$(LIBEXIFDIR)\exif-mnote-data-pentax.obj : $(LIBEXIFDIR)\pentax\exif-mnote-data-pentax.c\r
+       $(CC) -c $(CFLAGS) $[*  \r
+\r
+$(LIBEXIFDIR)\mnote-pentax-entry.obj : $(LIBEXIFDIR)\pentax\mnote-pentax-entry.c\r
+       $(CC) -c $(CFLAGS) $[*  \r
+\r
+$(LIBEXIFDIR)\mnote-pentax-tag.obj : $(LIBEXIFDIR)\pentax\mnote-pentax-tag.c\r
+       $(CC) -c $(CFLAGS) $[*  \r
+\r
+$(LIBEXIFDIR)\exif-mnote-data-canon.obj : $(LIBEXIFDIR)\canon\exif-mnote-data-canon.c\r
+       $(CC) -c $(CFLAGS) $[*  \r
+\r
+$(LIBEXIFDIR)\mnote-canon-entry.obj : $(LIBEXIFDIR)\canon\mnote-canon-entry.c\r
+       $(CC) -c $(CFLAGS) $[*  \r
+\r
+$(LIBEXIFDIR)\mnote-canon-tag.obj : $(LIBEXIFDIR)\canon\mnote-canon-tag.c\r
+       $(CC) -c $(CFLAGS) $[*  \r
+\r
+\r
+test-mem.exe : $(TESTEXIFDIR)\test-mem.c\r
+       $(CC) $(CFLAGS) $(LDFRLAGS) $< libexif.lib\r
+\r
+test-mnote.exe : $(TESTEXIFDIR)\test-mnote.c\r
+       $(CC) $(CFLAGS) $(LDFRLAGS) $< libexif.lib\r
+\r
+test-tree.exe : $(TESTEXIFDIR)\test-tree.c\r
+       $(CC) $(CFLAGS) $(LDFRLAGS) $< libexif.lib\r
+\r
+test-value.exe : $(TESTEXIFDIR)\test-value.c\r
+       $(CC) $(CFLAGS) $(LDFRLAGS) $< libexif.lib\r
+\r
+\r
+clean: .SYMBOLIC\r
+       - del $(LIBEXIFDIR)\*.obj\r
+       - del *.exe\r
+       - del libexif.lib\r
+\r

diff --git a/contrib/watcom/_stdint_watcom.h b/contrib/watcom/_stdint_watcom.h
new file mode 100644 (file)
index 0000000..7e95556
--- /dev/null
+++ b/contrib/watcom/_stdint_watcom.h
@@ -0,0 +1,11 @@
+/* This file is generated automatically by configure */
+#ifndef __STDINT_H
+#define __STDINT_H
+#include <sys/types.h>
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned long uint32_t;
+typedef signed long int32_t;
+#endif
+
+