Download as
Browse Code »

Commit d6dbd92f467683cce427c0e401a2963942a0a408

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

Ajustes para empacotamento windows.

Showing 3 changed files with 9 additions and 7 deletions   Show diff stats
@@ -71,6 +71,8 @@ RLS_CFLAGS="-DNDEBUG=1" @@ -71,6 +71,8 @@ RLS_CFLAGS="-DNDEBUG=1"
71 PLUGINS="" 71 PLUGINS=""
72 APP_RESOURCES="" 72 APP_RESOURCES=""
73 APP_LDFLAGS="" 73 APP_LDFLAGS=""
  74 +DLL_LDFLAGS="-shared"
  75 +STATIC_LDFLAGS=""
74 76
75 dnl --------------------------------------------------------------------------- 77 dnl ---------------------------------------------------------------------------
76 dnl Check for OS specifics 78 dnl Check for OS specifics
@@ -99,6 +101,7 @@ case "$host" in @@ -99,6 +101,7 @@ case "$host" in
99 101
100 dnl https://stackoverflow.com/questions/13768515/how-to-do-static-linking-of-libwinpthread-1-dll-in-mingw 102 dnl https://stackoverflow.com/questions/13768515/how-to-do-static-linking-of-libwinpthread-1-dll-in-mingw
101 STATIC_LDFLAGS="-static-libstdc++ -static-libgcc -static" 103 STATIC_LDFLAGS="-static-libstdc++ -static-libgcc -static"
  104 + DLL_LDFLAGS="-shared -Wl,--add-stdcall-alias"
102 105
103 AC_CONFIG_FILES(win/makeruntime.sh) 106 AC_CONFIG_FILES(win/makeruntime.sh)
104 AC_CONFIG_FILES(win/copydeps.sh) 107 AC_CONFIG_FILES(win/copydeps.sh)
@@ -117,8 +120,6 @@ case "$host" in @@ -117,8 +120,6 @@ case "$host" in
117 120
118 AC_SUBST(PROGRAMFILES,$app_cv_programfiles) 121 AC_SUBST(PROGRAMFILES,$app_cv_programfiles)
119 AC_SUBST(WINARCH,$app_cv_winarch) 122 AC_SUBST(WINARCH,$app_cv_winarch)
120 - AC_SUBST(STATIC_LDFLAGS)  
121 -  
122 ;; 123 ;;
123 124
124 *-apple-*) 125 *-apple-*)
@@ -153,7 +154,8 @@ AC_SUBST(DLLPREFIX) @@ -153,7 +154,8 @@ AC_SUBST(DLLPREFIX)
153 AC_SUBST(DLLEXT) 154 AC_SUBST(DLLEXT)
154 AC_SUBST(APP_RESOURCES) 155 AC_SUBST(APP_RESOURCES)
155 AC_SUBST(APP_LDFLAGS) 156 AC_SUBST(APP_LDFLAGS)
156 - 157 +AC_SUBST(DLL_LDFLAGS)
  158 +AC_SUBST(STATIC_LDFLAGS)
157 159
158 dnl --------------------------------------------------------------------------- 160 dnl ---------------------------------------------------------------------------
159 dnl Check for other programs 161 dnl Check for other programs
locale/pw3270.pot
  Diff comments   View file @d6dbd92
@@ -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-08-01 09:39-0300\n" 12 +"POT-Creation-Date: 2017-08-01 10:27-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-08-01 09:39-0300\n" 23 +"POT-Creation-Date: 2017-08-01 10:27-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 @d6dbd92
@@ -182,7 +182,7 @@ $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ @@ -182,7 +182,7 @@ $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
182 @echo $@ ... 182 @echo $@ ...
183 @$(MKDIR) `dirname $@` 183 @$(MKDIR) `dirname $@`
184 @$(LD) \ 184 @$(LD) \
185 - -shared \ 185 + @DLL_LDFLAGS@ \
186 -Wl,-soname,`basename $@` \ 186 -Wl,-soname,`basename $@` \
187 -L$(BASEDIR)/.bin/Release \ 187 -L$(BASEDIR)/.bin/Release \
188 @STATIC_LDFLAGS@ \ 188 @STATIC_LDFLAGS@ \
@@ -196,7 +196,7 @@ $(BINRLS)/plugins/$(MODULE_NAME)@DLLEXT@: \ @@ -196,7 +196,7 @@ $(BINRLS)/plugins/$(MODULE_NAME)@DLLEXT@: \
196 @echo $@ ... 196 @echo $@ ...
197 @$(MKDIR) `dirname $@` 197 @$(MKDIR) `dirname $@`
198 @$(LD) \ 198 @$(LD) \
199 - -shared \ 199 + @DLL_LDFLAGS@ \
200 -Wl,-soname,$(MODULE_NAME)d \ 200 -Wl,-soname,$(MODULE_NAME)d \
201 -L$(BASEDIR)/.bin/Release \ 201 -L$(BASEDIR)/.bin/Release \
202 -o $@ $(foreach SRC, $(basename $(PLUGIN_SOURCES)), $(OBJRLS)/$(SRC).o) \ 202 -o $@ $(foreach SRC, $(basename $(PLUGIN_SOURCES)), $(OBJRLS)/$(SRC).o) \