From: nishi <nishi@d4a5a174-5a4a-5b4b-b672-37683c10d7d5>
Date: Mon, 20 May 2024 05:21:31 +0000 (+0000)
Subject: idk
X-Git-Url: http://10.10.0.4:5575/?a=commitdiff_plain;h=3d390a294d7567cabfcb2d3c8ddb4d4c9eb73efb;p=dataworks.git

idk

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

diff --git a/Library/Makefile b/Library/Makefile
index cd7c733..9957f5c 100644
--- a/Library/Makefile
+++ b/Library/Makefile
@@ -12,6 +12,7 @@ $(LIB_PREFIX)dataworks$(LIB_SUFFIX): $(OBJS)
 
 $(STATICLIB_PREFIX)dataworks$(STATICLIB_SUFFIX): $(OBJS)
 	$(AR) rcs $@ $(OBJS)
+	$(RANLIB) $@
 
 .c.o:
 	$(CC) $(CFLAGS) -DPLATFORM_M=\"$(PLATFORM_M)\" -DPLATFORM_P=\"$(PLATFORM_P)\" -fPIC -c -o $@ $<
diff --git a/Platforms/win32.mk b/Platforms/win32.mk
index 41051fa..d316dfe 100644
--- a/Platforms/win32.mk
+++ b/Platforms/win32.mk
@@ -1,5 +1,6 @@
 CC = i686-w64-mingw32-gcc
-AR = i686-w64-mingw32-gcc-ar
+AR = i686-w64-mingw32-ar
+RANLIB = i686-w64-mingw32-ranlib
 LIB_PREFIX =
 LIB_SUFFIX = .dll
 EXEC_SUFFIX = .exe
diff --git a/Platforms/win64.mk b/Platforms/win64.mk
index 5b8ecb1..81c23bd 100644
--- a/Platforms/win64.mk
+++ b/Platforms/win64.mk
@@ -1,5 +1,6 @@
 CC = x86_64-w64-mingw32-gcc
-AR = x86_64-w64-mingw32-gcc-ar
+AR = x86_64-w64-mingw32-ar
+RANLIB = x86_64-w64-mingw32-ranlib
 LIB_PREFIX =
 LIB_SUFFIX = .dll
 EXEC_SUFFIX = .exe
diff --git a/common-decl.mk b/common-decl.mk
index 0207893..14e7d06 100644
--- a/common-decl.mk
+++ b/common-decl.mk
@@ -1,7 +1,8 @@
 # $Id$
 
 CC = cc
-AR = gcc-ar
+AR = ar
+RANLIB = ranlib
 CFLAGS = -std=c99 -D_DEFAULT_SOURCE
 LDFLAGS = -L`pwd`/Library
 LIBS =
diff --git a/common.mk b/common.mk
index 5a6aff1..2ee43e7 100644
--- 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)"
+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)"
 
 .PHONY: all no-doc replace format clean ./Library ./Client ./Document archive archive-prepare archive-cleanup archive-targz archive-zip