Mercurial > pub > dyncall > dyncall
changeset 400:d18f1a65e34f
windows lib name consistency changes for nmake builds
| author | Tassilo Philipp |
|---|---|
| date | Sat, 23 Jan 2021 15:33:30 +0100 |
| parents | 7eb98750bc47 |
| children | 1ef73f4c3a9f |
| files | ChangeLog dyncall/Nmakefile dyncallback/Nmakefile dynload/Nmakefile test/call_suite/Nmakefile test/callback_plain/Nmakefile test/callback_suite/Nmakefile test/callf/Nmakefile test/dynload_plain/Nmakefile test/ellipsis/Nmakefile test/malloc_wx/Nmakefile test/nm/Nmakefile test/plain/Nmakefile test/plain_c++/Nmakefile test/resolve_self/Nmakefile test/suite/Nmakefile test/suite2/Nmakefile test/suite2_x86win32fast/Nmakefile test/suite2_x86win32std/Nmakefile test/suite3/Nmakefile test/suite_floats/Nmakefile test/suite_x86win32fast/Nmakefile test/suite_x86win32std/Nmakefile test/thunk/Nmakefile |
| diffstat | 24 files changed, 30 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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
--- 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
--- 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)
--- 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"
--- 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"
--- 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"
--- 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"
--- 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) ...
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"