Commit 8b421a7231c2ccc1a0e5e2252a3cb18e518caf0d
1 parent
8debd9d9
Exists in
master
and in
5 other branches
Mudando DLLs do GCC para static na biblioteca hllapi para reduzir dependências n…
…a instalação windows.
Showing
3 changed files
with
5 additions
and
2 deletions
Show diff stats
configure.ac
| @@ -96,6 +96,7 @@ case "$host" in | @@ -96,6 +96,7 @@ case "$host" in | ||
| 96 | 96 | ||
| 97 | CFLAGS="$CFLAGS -D_WIN32_WINNT=0x0600" | 97 | CFLAGS="$CFLAGS -D_WIN32_WINNT=0x0600" |
| 98 | LIBS="$LIBS -lws2_32 -lwtsapi32 -lintl -lcomdlg32" | 98 | LIBS="$LIBS -lws2_32 -lwtsapi32 -lintl -lcomdlg32" |
| 99 | + HLLAPI_LDFLAGS="-static-libstdc++ -static-libgcc" | ||
| 99 | 100 | ||
| 100 | AC_CONFIG_FILES(win/makeruntime.sh) | 101 | AC_CONFIG_FILES(win/makeruntime.sh) |
| 101 | AC_CONFIG_FILES(win/copydeps.sh) | 102 | AC_CONFIG_FILES(win/copydeps.sh) |
| @@ -114,6 +115,7 @@ case "$host" in | @@ -114,6 +115,7 @@ case "$host" in | ||
| 114 | 115 | ||
| 115 | AC_SUBST(PROGRAMFILES,$app_cv_programfiles) | 116 | AC_SUBST(PROGRAMFILES,$app_cv_programfiles) |
| 116 | AC_SUBST(WINARCH,$app_cv_winarch) | 117 | AC_SUBST(WINARCH,$app_cv_winarch) |
| 118 | + AC_SUBST(HLLAPI_LDFLAGS) | ||
| 117 | 119 | ||
| 118 | ;; | 120 | ;; |
| 119 | 121 |
locale/pw3270.pot
| @@ -9,7 +9,7 @@ msgstr "" | @@ -9,7 +9,7 @@ msgstr "" | ||
| 9 | "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n" | 9 | "#-#-#-#-# lib3270.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: 2017-07-28 14:24-0300\n" | 12 | +"POT-Creation-Date: 2017-07-31 16:15-0300\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" |
| @@ -20,7 +20,7 @@ msgstr "" | @@ -20,7 +20,7 @@ msgstr "" | ||
| 20 | "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n" | 20 | "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n" |
| 21 | "Project-Id-Version: PACKAGE VERSION\n" | 21 | "Project-Id-Version: PACKAGE VERSION\n" |
| 22 | "Report-Msgid-Bugs-To: \n" | 22 | "Report-Msgid-Bugs-To: \n" |
| 23 | -"POT-Creation-Date: 2017-07-28 14:24-0300\n" | 23 | +"POT-Creation-Date: 2017-07-31 16:15-0300\n" |
| 24 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 24 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
| 25 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 25 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
| 26 | "Language-Team: LANGUAGE <LL@li.org>\n" | 26 | "Language-Team: LANGUAGE <LL@li.org>\n" |
src/plugins/hllapi/Makefile.in
| @@ -185,6 +185,7 @@ $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ | @@ -185,6 +185,7 @@ $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ | ||
| 185 | -shared \ | 185 | -shared \ |
| 186 | -Wl,-soname,`basename $@` \ | 186 | -Wl,-soname,`basename $@` \ |
| 187 | -L$(BASEDIR)/.bin/Release \ | 187 | -L$(BASEDIR)/.bin/Release \ |
| 188 | + @HLLAPI_LDFLAGS@ \ | ||
| 188 | -o $@ $^ \ | 189 | -o $@ $^ \ |
| 189 | $(API_LIBS) | 190 | $(API_LIBS) |
| 190 | 191 |