Download as
Browse Code »

Commit 11d28310d6f734b421c65afee7ef0a656d8ad5d1

Authored by Perry Werneck
1 parent 8b421a72
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Ajustando dependências da hllapi

Showing 4 changed files with 8 additions and 5 deletions   Show diff stats
@@ -96,7 +96,9 @@ case "$host" in @@ -96,7 +96,9 @@ 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 + dnl https://stackoverflow.com/questions/13768515/how-to-do-static-linking-of-libwinpthread-1-dll-in-mingw
  101 + STATIC_LDFLAGS="-static-libstdc++ -static-libgcc"
100 102
101 AC_CONFIG_FILES(win/makeruntime.sh) 103 AC_CONFIG_FILES(win/makeruntime.sh)
102 AC_CONFIG_FILES(win/copydeps.sh) 104 AC_CONFIG_FILES(win/copydeps.sh)
@@ -115,7 +117,7 @@ case "$host" in @@ -115,7 +117,7 @@ case "$host" in
115 117
116 AC_SUBST(PROGRAMFILES,$app_cv_programfiles) 118 AC_SUBST(PROGRAMFILES,$app_cv_programfiles)
117 AC_SUBST(WINARCH,$app_cv_winarch) 119 AC_SUBST(WINARCH,$app_cv_winarch)
118 - AC_SUBST(HLLAPI_LDFLAGS) 120 + AC_SUBST(STATIC_LDFLAGS)
119 121
120 ;; 122 ;;
121 123
locale/pw3270.pot
  Diff comments   View file @11d2831
@@ -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-31 16:15-0300\n" 12 +"POT-Creation-Date: 2017-07-31 17:31-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 &quot;&quot; @@ -20,7 +20,7 @@ msgstr &quot;&quot;
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-31 16:15-0300\n" 23 +"POT-Creation-Date: 2017-07-31 17:31-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
  Diff comments   View file @11d2831
@@ -185,7 +185,7 @@ $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ @@ -185,7 +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 + @STATIC_LDFLAGS@ \
189 -o $@ $^ \ 189 -o $@ $^ \
190 $(API_LIBS) 190 $(API_LIBS)
191 191
win/pw3270.nsi.in
  Diff comments   View file @11d2831
@@ -134,6 +134,7 @@ SubSection &quot;@PACKAGE@&quot; SecMain @@ -134,6 +134,7 @@ SubSection &quot;@PACKAGE@&quot; SecMain
134 CreateDirectory "$INSTDIR\plugins" 134 CreateDirectory "$INSTDIR\plugins"
135 file "/oname=$INSTDIR\plugins\hllapi.dll" "..\.bin\Release\plugins\hllapi.dll" 135 file "/oname=$INSTDIR\plugins\hllapi.dll" "..\.bin\Release\plugins\hllapi.dll"
136 file "/oname=$SYSDIR\libhllapi.dll" "..\.bin\Release\libhllapi.dll.@PACKAGE_VERSION@" 136 file "/oname=$SYSDIR\libhllapi.dll" "..\.bin\Release\libhllapi.dll.@PACKAGE_VERSION@"
  137 + file "/oname=$SYSDIR\libwinpthread-1.dll" "..\.bin\runtime\libwinpthread-1.dll"
137 138
138 sectionEnd 139 sectionEnd
139 140