watcom works

git-svn-id: file:///raid/svn-main/nishi-dataworks/trunk@48 d4a5a174-5a4a-5b4b-b672-37683c10d7d5

diff --git a/Library/Makefile b/Library/Makefile
index 42fd89aa859486ead8c2e46ca38de395c3ce4968..c033494ee52515d7273fc513980a01d5e90ac84c 100644 (file)
--- a/Library/Makefile
+++ b/Library/Makefile
@@ -11,7 +11,7 @@ $(LIB_PREFIX)dataworks$(LIB_SUFFIX): $(OBJS)
        $(SHCC) -shared $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
 $(STATICLIB_PREFIX)dataworks$(STATICLIB_SUFFIX): $(OBJS)
-       $(AR) rcs $@ $(OBJS)
+       $(AR) $(AR_ARGS) $(OBJS)
        $(RANLIB) $@
 
 .c.o:

diff --git a/Platforms/watcom.mk b/Platforms/watcom.mk
index b7a4c58fdac2e9d9ec6e311b2929eb133fa2a576..ca2658bf02e10424c8eccd930df3784c79d0facf 100644 (file)
--- a/Platforms/watcom.mk
+++ b/Platforms/watcom.mk
@@ -1,6 +1,7 @@
 CC = WATCOM=$$WATCOM INCLUDE=$$WATCOM/h PATH=$$PATH:$$WATCOM/binl64 owcc
 SHCC = /bin/true
-AR = /bin/true
+AR = WATCOM=$$WATCOM INCLUDE=$$WATCOM/h PATH=$$PATH:$$WATCOM/binl64 wlib
+AR_ARGS = -b -n -fag -o=\$$@
 RANLIB = /bin/true
 LIB_PREFIX =
 LIB_SUFFIX = .dll

diff --git a/common-decl.mk b/common-decl.mk
index e6dce6489417949ca9a0ce9e84c7dab314434716..bd35c343ee7f8702167156a5f9a1eff3454270ab 100644 (file)
--- a/common-decl.mk
+++ b/common-decl.mk
@@ -3,6 +3,7 @@
 CC = cc
 SHCC = cc
 AR = ar
+AR_ARGS = rcs \$$@
 RANLIB = ranlib
 CFLAGS = -std=c99 -D_DEFAULT_SOURCE
 LDFLAGS = -L`pwd`/Library

diff --git a/common.mk b/common.mk
index 743655e7c3a71f57cd657385a33b5fc30501015b..8c28f8e5c5b25ac26230eaa74f15b023d1e42119 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -1,6 +1,6 @@
 # $Id$
 
-COMPILE_FLAGS = CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" LIB_PREFIX="$(LIB_PREFIX)" LIB_SUFFIX="$(LIB_SUFFIX)" EXEC_SUFFIX="$(EXEC_SUFFIX)" PLATFORM_M="$(PLATFORM_M)" PLATFORM_P="$(PLATFORM_P)" STATICLIB_PREFIX="$(STATICLIB_PREFIX)" STATICLIB_SUFFIX="$(STATICLIB_SUFFIX)" AR="$(AR)" RANLIB="$(RANLIB)" SHCC="$(SHCC)" LINK_LIN="$(LINK_LIB)"
+COMPILE_FLAGS = CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" LIB_PREFIX="$(LIB_PREFIX)" LIB_SUFFIX="$(LIB_SUFFIX)" EXEC_SUFFIX="$(EXEC_SUFFIX)" PLATFORM_M="$(PLATFORM_M)" PLATFORM_P="$(PLATFORM_P)" STATICLIB_PREFIX="$(STATICLIB_PREFIX)" STATICLIB_SUFFIX="$(STATICLIB_SUFFIX)" AR="$(AR)" RANLIB="$(RANLIB)" SHCC="$(SHCC)" LINK_LIN="$(LINK_LIB)" AR_ARGS="$(AR_ARGS)"
 
 .PHONY: all no-doc replace format clean ./Library ./Client ./Document archive archive-prepare archive-cleanup archive-targz archive-zip