Download as
Browse Code »

Commit 39448f2cf2c075cea38d1bbec50661bb306c8d25

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

Ajustando empacotamento windows.

Showing 5 changed files with 20 additions and 9 deletions   Show diff stats
@@ -95,10 +95,10 @@ case "$host" in @@ -95,10 +95,10 @@ case "$host" in
95 RLS_CFLAGS="-DNDEBUG=1" 95 RLS_CFLAGS="-DNDEBUG=1"
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 -lcomdlg32"
99 99
100 dnl https://stackoverflow.com/questions/13768515/how-to-do-static-linking-of-libwinpthread-1-dll-in-mingw 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" 101 + STATIC_LDFLAGS="-static-libstdc++ -static-libgcc -static"
102 102
103 AC_CONFIG_FILES(win/makeruntime.sh) 103 AC_CONFIG_FILES(win/makeruntime.sh)
104 AC_CONFIG_FILES(win/copydeps.sh) 104 AC_CONFIG_FILES(win/copydeps.sh)
@@ -218,6 +218,8 @@ dnl --------------------------------------------------------------------------- @@ -218,6 +218,8 @@ dnl ---------------------------------------------------------------------------
218 dnl Check for libintl 218 dnl Check for libintl
219 dnl --------------------------------------------------------------------------- 219 dnl ---------------------------------------------------------------------------
220 220
  221 +INTL_LIBS=""
  222 +
221 AC_PATH_TOOL([XGETTEXT], [xgettext], [no]) 223 AC_PATH_TOOL([XGETTEXT], [xgettext], [no])
222 AC_PATH_TOOL([MSGCAT], [msgcat], [no]) 224 AC_PATH_TOOL([MSGCAT], [msgcat], [no])
223 AC_PATH_TOOL([MSGINIT], [msginit], [no]) 225 AC_PATH_TOOL([MSGINIT], [msginit], [no])
@@ -229,8 +231,21 @@ AC_PATH_TOOL([OPTIPNG],[optipng],[no]) @@ -229,8 +231,21 @@ AC_PATH_TOOL([OPTIPNG],[optipng],[no])
229 231
230 AC_CHECK_HEADER(libintl.h, [ 232 AC_CHECK_HEADER(libintl.h, [
231 AC_DEFINE(HAVE_LIBINTL, 1) 233 AC_DEFINE(HAVE_LIBINTL, 1)
  234 +
  235 + case "$host" in
  236 + *-mingw32)
  237 + INTL_LIBS="-lintl"
  238 + ;;
  239 +
  240 + *)
  241 + INTL_LIBS=""
  242 +
  243 + esac
  244 +
232 ]) 245 ])
233 246
  247 +AC_SUBST(INTL_LIBS)
  248 +
234 dnl --------------------------------------------------------------------------- 249 dnl ---------------------------------------------------------------------------
235 dnl Check for ELF symbol visibility support 250 dnl Check for ELF symbol visibility support
236 dnl --------------------------------------------------------------------------- 251 dnl ---------------------------------------------------------------------------
locale/pw3270.pot
  Diff comments   View file @39448f2
@@ -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 17:39-0300\n" 12 +"POT-Creation-Date: 2017-08-01 09:39-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 17:39-0300\n" 23 +"POT-Creation-Date: 2017-08-01 09:39-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/lib3270/Makefile.in
  Diff comments   View file @39448f2
@@ -76,7 +76,7 @@ HOST_CC=@HOST_CC@ @@ -76,7 +76,7 @@ HOST_CC=@HOST_CC@
76 LD=@CC@ 76 LD=@CC@
77 77
78 CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ @LIBSSL_CFLAGS@ 78 CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ @LIBSSL_CFLAGS@
79 -LIBS=@LIBS@ @LIBSSL_LIBS@ @LIBICONV@ 79 +LIBS=@LIBS@ @LIBSSL_LIBS@ @LIBICONV@ @INTL_LIBS@
80 LDFLAGS=@LDFLAGS@ 80 LDFLAGS=@LDFLAGS@
81 81
82 #---[ Rules ]---------------------------------------------------------------------------- 82 #---[ Rules ]----------------------------------------------------------------------------
win/makeruntime.sh.in
  Diff comments   View file @39448f2
@@ -145,9 +145,6 @@ copy_dll() { @@ -145,9 +145,6 @@ copy_dll() {
145 145
146 done < ${REQUIRES} 146 done < ${REQUIRES}
147 147
148 - # Anexo as obrigatórias  
149 - cp ${prefix}/bin/libwinpthread-1.dll ${TARGET}  
150 -  
151 rm -f ${SOURCES} 148 rm -f ${SOURCES}
152 rm -f ${REQUIRES} 149 rm -f ${REQUIRES}
153 150
win/pw3270.nsi.in
  Diff comments   View file @39448f2
@@ -134,7 +134,6 @@ SubSection &quot;@PACKAGE@&quot; SecMain @@ -134,7 +134,6 @@ 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"  
138 137
139 sectionEnd 138 sectionEnd
140 139