Commit cccd74cf33f444986cf82a43d3ccb3581d98361f
1 parent
ac06a832
Exists in
master
and in
5 other branches
Updating HLLAPI on customized windows builds.
Showing
2 changed files
with
8 additions
and
1 deletions
Show diff stats
locale/pw3270.pot
@@ -9,7 +9,7 @@ msgstr "" | @@ -9,7 +9,7 @@ msgstr "" | ||
9 | "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n" | 9 | "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n" |
10 | "Project-Id-Version: PACKAGE VERSION\n" | 10 | "Project-Id-Version: PACKAGE VERSION\n" |
11 | "Report-Msgid-Bugs-To: \n" | 11 | "Report-Msgid-Bugs-To: \n" |
12 | -"POT-Creation-Date: 2019-02-01 15:39-0200\n" | 12 | +"POT-Creation-Date: 2019-02-01 15:56-0200\n" |
13 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 13 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
14 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 14 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
15 | "Language-Team: LANGUAGE <LL@li.org>\n" | 15 | "Language-Team: LANGUAGE <LL@li.org>\n" |
src/plugins/hllapi/Makefile.in
@@ -87,6 +87,9 @@ PLUGIN_LIBS=\ | @@ -87,6 +87,9 @@ PLUGIN_LIBS=\ | ||
87 | @LIBV3270_LIBS@ \ | 87 | @LIBV3270_LIBS@ \ |
88 | @PW3270_LIBS@ | 88 | @PW3270_LIBS@ |
89 | 89 | ||
90 | +LDFLAGS=\ | ||
91 | + @LDFLAGS@ | ||
92 | + | ||
90 | #---[ Rules ]---------------------------------------------------------------------------- | 93 | #---[ Rules ]---------------------------------------------------------------------------- |
91 | 94 | ||
92 | DEPENDS=*.h Makefile | 95 | DEPENDS=*.h Makefile |
@@ -197,6 +200,7 @@ $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ | @@ -197,6 +200,7 @@ $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ | ||
197 | @echo $@ ... | 200 | @echo $@ ... |
198 | @$(MKDIR) `dirname $@` | 201 | @$(MKDIR) `dirname $@` |
199 | @$(LD) \ | 202 | @$(LD) \ |
203 | + $(LDFLAGS) \ | ||
200 | @DLL_LDFLAGS@ \ | 204 | @DLL_LDFLAGS@ \ |
201 | -Wl,-soname,`basename $@` \ | 205 | -Wl,-soname,`basename $@` \ |
202 | -L$(BASEDIR)/.bin/Release \ | 206 | -L$(BASEDIR)/.bin/Release \ |
@@ -211,6 +215,7 @@ $(BINRLS)/plugins/$(MODULE_NAME)@DLLEXT@: \ | @@ -211,6 +215,7 @@ $(BINRLS)/plugins/$(MODULE_NAME)@DLLEXT@: \ | ||
211 | @echo $@ ... | 215 | @echo $@ ... |
212 | @$(MKDIR) `dirname $@` | 216 | @$(MKDIR) `dirname $@` |
213 | @$(LD) \ | 217 | @$(LD) \ |
218 | + $(LDFLAGS) \ | ||
214 | @DLL_LDFLAGS@ \ | 219 | @DLL_LDFLAGS@ \ |
215 | -Wl,-soname,$(MODULE_NAME)d \ | 220 | -Wl,-soname,$(MODULE_NAME)d \ |
216 | -L$(BASEDIR)/.bin/Release \ | 221 | -L$(BASEDIR)/.bin/Release \ |
@@ -267,6 +272,7 @@ $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ | @@ -267,6 +272,7 @@ $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ | ||
267 | @$(LD) \ | 272 | @$(LD) \ |
268 | -shared \ | 273 | -shared \ |
269 | -Wl,-soname,`basename $@` \ | 274 | -Wl,-soname,`basename $@` \ |
275 | + $(LDFLAGS) \ | ||
270 | -L$(BASEDIR)/.bin/Debug \ | 276 | -L$(BASEDIR)/.bin/Debug \ |
271 | -o $@ $^ \ | 277 | -o $@ $^ \ |
272 | $(API_LIBS) | 278 | $(API_LIBS) |
@@ -280,6 +286,7 @@ $(BINDBG)/plugins/$(MODULE_NAME)@DLLEXT@: \ | @@ -280,6 +286,7 @@ $(BINDBG)/plugins/$(MODULE_NAME)@DLLEXT@: \ | ||
280 | @$(LD) \ | 286 | @$(LD) \ |
281 | -shared \ | 287 | -shared \ |
282 | -Wl,-soname,$(MODULE_NAME)d,--rpath,$(BASEDIR)/.bin/Debug \ | 288 | -Wl,-soname,$(MODULE_NAME)d,--rpath,$(BASEDIR)/.bin/Debug \ |
289 | + $(LDFLAGS) \ | ||
283 | -L$(BASEDIR)/.bin/Debug \ | 290 | -L$(BASEDIR)/.bin/Debug \ |
284 | -o $@ $(foreach SRC, $(basename $(PLUGIN_SOURCES)), $(OBJDBG)/$(SRC).o) \ | 291 | -o $@ $(foreach SRC, $(basename $(PLUGIN_SOURCES)), $(OBJDBG)/$(SRC).o) \ |
285 | $(PLUGIN_LIBS) | 292 | $(PLUGIN_LIBS) |