# HG changeset patch
# User Tassilo Philipp
# Date 1611412410 -3600
# Node ID d18f1a65e34fa9553bac1c017521a683c7924e79
# Parent  7eb98750bc47b260e45348e79d409b4ff43a7f25
windows lib name consistency changes for nmake builds

diff -r 7eb98750bc47 -r d18f1a65e34f ChangeLog
--- a/ChangeLog	Wed Apr 07 17:33:23 2021 +0200
+++ b/ChangeLog	Sat Jan 23 15:33:30 2021 +0100
@@ -5,6 +5,9 @@
 
 dynload:
   o dynload fix for PE files that do not contain a symbol export directory (thanks Ashok!)
+buildsys:
+  o windows/nmake based builds: output library name changes to follow conventions of the native
+    platform and be in line with cmake based builds
 
 
 Version 1.2 (2021/01/23)
diff -r 7eb98750bc47 -r d18f1a65e34f dyncall/Nmakefile
--- a/dyncall/Nmakefile	Wed Apr 07 17:33:23 2021 +0200
+++ b/dyncall/Nmakefile	Sat Jan 23 15:33:30 2021 +0100
@@ -32,15 +32,15 @@
 
 !IF "$(BUILD_OS)" == "windows"
 
-TARGETS = libdyncall_s.lib #libdyncall.lib libdyncall.dll
+TARGETS = dyncall_s.lib #dyncall.lib dyncall.dll
 
 OBJS = dyncall_call_$(BUILD_ARCH)_generic_masm.obj dyncall_vector.obj dyncall_vector.obj dyncall_callvm.obj dyncall_callvm_base.obj dyncall_api.obj dyncall_callf.obj dyncall_struct.obj
 
-libdyncall_s.lib: $(OBJS)
+dyncall_s.lib: $(OBJS)
 	echo Creating library $@ ...
 	$(AR) $(ARFLAGS) /OUT:"$@" $(OBJS) > nul
 
-libdyncall.dll libdyncall.lib: $(OBJS)
+dyncall.dll dyncall.lib: $(OBJS)
 	echo Creating shared/import library $@ ...
 	$(LD) /DLL $(LDFLAGS) $(OBJS) > nul
 
diff -r 7eb98750bc47 -r d18f1a65e34f dyncallback/Nmakefile
--- a/dyncallback/Nmakefile	Wed Apr 07 17:33:23 2021 +0200
+++ b/dyncallback/Nmakefile	Sat Jan 23 15:33:30 2021 +0100
@@ -32,14 +32,14 @@
 
 !IF "$(BUILD_OS)" == "windows"
 
-TARGETS = libdyncallback_s.lib #libdyncallback.lib libdyncallback.dll
+TARGETS = dyncallback_s.lib #dyncallback.lib dyncallback.dll
 OBJS = dyncall_thunk.obj dyncall_alloc_wx.obj dyncall_args.obj dyncall_callback.obj dyncall_callback_$(BUILD_ARCH)_masm.obj 
 
-libdyncallback_s.lib: $(OBJS)
+dyncallback_s.lib: $(OBJS)
 	echo Creating library $@ ...
 	$(AR) $(ARFLAGS) /OUT:"$@" $(OBJS) > nul
 
-libdyncallback.dll libdyncallback.lib: $(OBJS)
+dyncallback.dll dyncallback.lib: $(OBJS)
 	echo Creating shared/import library $@ ...
 	$(LD) /DLL $(LDFLAGS) $(OBJS) > nul
 
diff -r 7eb98750bc47 -r d18f1a65e34f dynload/Nmakefile
--- a/dynload/Nmakefile	Wed Apr 07 17:33:23 2021 +0200
+++ b/dynload/Nmakefile	Sat Jan 23 15:33:30 2021 +0100
@@ -32,7 +32,7 @@
 
 !IF "$(BUILD_OS)" == "windows"
 
-TARGETS = libdynload_s.lib
+TARGETS = dynload_s.lib
 OBJS = dynload.obj dynload_syms.obj
 
 $(TARGETS): $(OBJS)
diff -r 7eb98750bc47 -r d18f1a65e34f test/call_suite/Nmakefile
--- a/test/call_suite/Nmakefile	Wed Apr 07 17:33:23 2021 +0200
+++ b/test/call_suite/Nmakefile	Sat Jan 23 15:33:30 2021 +0100
@@ -40,7 +40,7 @@
 
 $(TARGETS): $(OBJS)
 	echo Linking $@ ...
-	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\libdyncall_s.lib
+	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\dyncall_s.lib
 
 
 !ELSE IF "$(BUILD_OS)" == "nds"
diff -r 7eb98750bc47 -r d18f1a65e34f test/callback_plain/Nmakefile
--- a/test/callback_plain/Nmakefile	Wed Apr 07 17:33:23 2021 +0200
+++ b/test/callback_plain/Nmakefile	Sat Jan 23 15:33:30 2021 +0100
@@ -37,7 +37,7 @@
 
 $(TARGETS): $(OBJS)
 	echo Linking $@ ...
-	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\libdyncall_s.lib $(TOP)\dyncallback\libdyncallback_s.lib
+	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\dyncall_s.lib $(TOP)\dyncallback\dyncallback_s.lib
 
 
 !ELSE IF "$(BUILD_OS)" == "nds"
diff -r 7eb98750bc47 -r d18f1a65e34f test/callback_suite/Nmakefile
--- a/test/callback_suite/Nmakefile	Wed Apr 07 17:33:23 2021 +0200
+++ b/test/callback_suite/Nmakefile	Sat Jan 23 15:33:30 2021 +0100
@@ -37,7 +37,7 @@
 OBJS = env.obj handler.obj sigstrings.obj invokers.obj do_test.obj main.obj print.obj signature_utils.obj
 $(TARGETS): $(OBJS)
 	echo Linking $@ ...
-	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\libdyncall_s.lib $(TOP)\dyncallback\libdyncallback_s.lib
+	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\dyncall_s.lib $(TOP)\dyncallback\dyncallback_s.lib
 
 
 !ELSE IF "$(BUILD_OS)" == "nds"
diff -r 7eb98750bc47 -r d18f1a65e34f test/callf/Nmakefile
--- a/test/callf/Nmakefile	Wed Apr 07 17:33:23 2021 +0200
+++ b/test/callf/Nmakefile	Sat Jan 23 15:33:30 2021 +0100
@@ -37,7 +37,7 @@
 
 $(TARGETS): $(OBJS)
 	echo Linking $@ ...
-	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\libdyncall_s.lib > nul
+	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\dyncall_s.lib > nul
 
 
 !ELSE IF "$(BUILD_OS)" == "nds"
diff -r 7eb98750bc47 -r d18f1a65e34f test/dynload_plain/Nmakefile
--- a/test/dynload_plain/Nmakefile	Wed Apr 07 17:33:23 2021 +0200
+++ b/test/dynload_plain/Nmakefile	Sat Jan 23 15:33:30 2021 +0100
@@ -37,7 +37,7 @@
 
 dynload_plain.exe: $(OBJS)
 	echo Linking $@ ...
-	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dynload\libdynload_s.lib $(TOP)\dyncall\libdyncall_s.lib
+	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dynload\dynload_s.lib $(TOP)\dyncall\dyncall_s.lib
 
 $(TEST_U8_SO):
 	echo Building helper lib with UTF-8 path $(TEST_U8_SO) ...
diff -r 7eb98750bc47 -r d18f1a65e34f test/ellipsis/Nmakefile
--- a/test/ellipsis/Nmakefile	Wed Apr 07 17:33:23 2021 +0200
+++ b/test/ellipsis/Nmakefile	Sat Jan 23 15:33:30 2021 +0100
@@ -40,7 +40,7 @@
 
 $(TARGETS): $(OBJS)
 	echo Linking $@ ...
-	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\libdyncall_s.lib > nul
+	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\dyncall_s.lib > nul
 
 
 !ELSE IF "$(BUILD_OS)" == "nds"
diff -r 7eb98750bc47 -r d18f1a65e34f test/malloc_wx/Nmakefile
--- a/test/malloc_wx/Nmakefile	Wed Apr 07 17:33:23 2021 +0200
+++ b/test/malloc_wx/Nmakefile	Sat Jan 23 15:33:30 2021 +0100
@@ -37,7 +37,7 @@
 
 $(TARGETS): $(OBJS)
 	echo Linking $@ ...
-	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\libdyncall_s.lib $(TOP)\dyncallback\libdyncallback_s.lib
+	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\dyncall_s.lib $(TOP)\dyncallback\dyncallback_s.lib
 
 
 !ELSE IF "$(BUILD_OS)" == "nds"
diff -r 7eb98750bc47 -r d18f1a65e34f test/nm/Nmakefile
--- a/test/nm/Nmakefile	Wed Apr 07 17:33:23 2021 +0200
+++ b/test/nm/Nmakefile	Sat Jan 23 15:33:30 2021 +0100
@@ -37,7 +37,7 @@
 
 $(TARGETS): $(OBJS)
 	echo Linking $@ ...
-	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dynload\libdynload_s.lib $(TOP)\dyncall\libdyncall_s.lib
+	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dynload\dynload_s.lib $(TOP)\dyncall\dyncall_s.lib
 
 
 !ELSE IF "$(BUILD_OS)" == "nds"
diff -r 7eb98750bc47 -r d18f1a65e34f test/plain/Nmakefile
--- a/test/plain/Nmakefile	Wed Apr 07 17:33:23 2021 +0200
+++ b/test/plain/Nmakefile	Sat Jan 23 15:33:30 2021 +0100
@@ -37,7 +37,7 @@
 
 $(TARGETS): $(OBJS)
 	echo Linking $@ ...
-	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\libdyncall_s.lib
+	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\dyncall_s.lib
 
 
 !ELSE IF "$(BUILD_OS)" == "nds"
diff -r 7eb98750bc47 -r d18f1a65e34f test/plain_c++/Nmakefile
--- a/test/plain_c++/Nmakefile	Wed Apr 07 17:33:23 2021 +0200
+++ b/test/plain_c++/Nmakefile	Sat Jan 23 15:33:30 2021 +0100
@@ -37,7 +37,7 @@
 
 $(TARGETS): $(OBJS)
 	echo Linking $@ ...
-	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\libdyncall_s.lib
+	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\dyncall_s.lib
 
 
 !ELSE IF "$(BUILD_OS)" == "nds"
diff -r 7eb98750bc47 -r d18f1a65e34f test/resolve_self/Nmakefile
--- a/test/resolve_self/Nmakefile	Wed Apr 07 17:33:23 2021 +0200
+++ b/test/resolve_self/Nmakefile	Sat Jan 23 15:33:30 2021 +0100
@@ -37,7 +37,7 @@
 
 $(TARGETS): $(OBJS)
 	echo Linking $@ ...
-	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dynload\libdynload_s.lib $(TOP)\dyncall\libdyncall_s.lib
+	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dynload\dynload_s.lib $(TOP)\dyncall\dyncall_s.lib
 
 
 !ELSE IF "$(BUILD_OS)" == "nds"
diff -r 7eb98750bc47 -r d18f1a65e34f test/suite/Nmakefile
--- a/test/suite/Nmakefile	Wed Apr 07 17:33:23 2021 +0200
+++ b/test/suite/Nmakefile	Sat Jan 23 15:33:30 2021 +0100
@@ -40,7 +40,7 @@
 
 $(TARGETS): $(OBJS)
 	echo Linking $@ ...
-	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\libdyncall_s.lib > nul
+	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\dyncall_s.lib > nul
 
 
 !ELSE IF "$(BUILD_OS)" == "nds"
diff -r 7eb98750bc47 -r d18f1a65e34f test/suite2/Nmakefile
--- a/test/suite2/Nmakefile	Wed Apr 07 17:33:23 2021 +0200
+++ b/test/suite2/Nmakefile	Sat Jan 23 15:33:30 2021 +0100
@@ -40,7 +40,7 @@
 
 $(TARGETS): $(OBJS)
 	echo Linking $@ ...
-	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\libdyncall_s.lib > nul
+	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\dyncall_s.lib > nul
 
 
 !ELSE IF "$(BUILD_OS)" == "nds"
diff -r 7eb98750bc47 -r d18f1a65e34f test/suite2_x86win32fast/Nmakefile
--- a/test/suite2_x86win32fast/Nmakefile	Wed Apr 07 17:33:23 2021 +0200
+++ b/test/suite2_x86win32fast/Nmakefile	Sat Jan 23 15:33:30 2021 +0100
@@ -40,7 +40,7 @@
 
 $(TARGETS): $(OBJS)
 	echo Linking $@ ...
-	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\libdyncall_s.lib > nul
+	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\dyncall_s.lib > nul
 
 
 !ELSE IF "$(BUILD_OS)" == "nds"
diff -r 7eb98750bc47 -r d18f1a65e34f test/suite2_x86win32std/Nmakefile
--- a/test/suite2_x86win32std/Nmakefile	Wed Apr 07 17:33:23 2021 +0200
+++ b/test/suite2_x86win32std/Nmakefile	Sat Jan 23 15:33:30 2021 +0100
@@ -40,7 +40,7 @@
 
 $(TARGETS): $(OBJS)
 	echo Linking $@ ...
-	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\libdyncall_s.lib > nul
+	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\dyncall_s.lib > nul
 
 
 !ELSE IF "$(BUILD_OS)" == "nds"
diff -r 7eb98750bc47 -r d18f1a65e34f test/suite3/Nmakefile
--- a/test/suite3/Nmakefile	Wed Apr 07 17:33:23 2021 +0200
+++ b/test/suite3/Nmakefile	Sat Jan 23 15:33:30 2021 +0100
@@ -40,7 +40,7 @@
 
 $(TARGETS): $(OBJS)
 	echo Linking $@ ...
-	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\libdyncall_s.lib > nul
+	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\dyncall_s.lib > nul
 
 
 !ELSE IF "$(BUILD_OS)" == "nds"
diff -r 7eb98750bc47 -r d18f1a65e34f test/suite_floats/Nmakefile
--- a/test/suite_floats/Nmakefile	Wed Apr 07 17:33:23 2021 +0200
+++ b/test/suite_floats/Nmakefile	Sat Jan 23 15:33:30 2021 +0100
@@ -38,7 +38,7 @@
 
 $(TARGETS): $(OBJS)
 	echo Linking $@ ...
-	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\libdyncall_s.lib > nul
+	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\dyncall_s.lib > nul
 
 
 !ELSE IF "$(BUILD_OS)" == "nds"
diff -r 7eb98750bc47 -r d18f1a65e34f test/suite_x86win32fast/Nmakefile
--- a/test/suite_x86win32fast/Nmakefile	Wed Apr 07 17:33:23 2021 +0200
+++ b/test/suite_x86win32fast/Nmakefile	Sat Jan 23 15:33:30 2021 +0100
@@ -40,7 +40,7 @@
 
 $(TARGETS): $(OBJS)
 	echo Linking $@ ...
-	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\libdyncall_s.lib > nul
+	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\dyncall_s.lib > nul
 
 
 !ELSE IF "$(BUILD_OS)" == "nds"
diff -r 7eb98750bc47 -r d18f1a65e34f test/suite_x86win32std/Nmakefile
--- a/test/suite_x86win32std/Nmakefile	Wed Apr 07 17:33:23 2021 +0200
+++ b/test/suite_x86win32std/Nmakefile	Sat Jan 23 15:33:30 2021 +0100
@@ -40,7 +40,7 @@
 
 $(TARGETS): $(OBJS)
 	echo Linking $@ ...
-	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\libdyncall_s.lib > nul
+	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\dyncall_s.lib > nul
 
 
 !ELSE IF "$(BUILD_OS)" == "nds"
diff -r 7eb98750bc47 -r d18f1a65e34f test/thunk/Nmakefile
--- a/test/thunk/Nmakefile	Wed Apr 07 17:33:23 2021 +0200
+++ b/test/thunk/Nmakefile	Sat Jan 23 15:33:30 2021 +0100
@@ -37,7 +37,7 @@
 
 $(TARGETS): $(OBJS)
 	echo Linking $@ ...
-	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\libdyncall_s.lib $(TOP)\dyncallback\libdyncallback_s.lib
+	$(LD) /OUT:"$@" $(LDFLAGS) $(OBJS) $(TOP)\dyncall\dyncall_s.lib $(TOP)\dyncallback\dyncallback_s.lib
 
 
 !ELSE IF "$(BUILD_OS)" == "nds"