Download as
Browse Code »

Commit 73409a6e1e27361fdfae2bc4af0c2e3b8afbb830

Authored by Perry Werneck
1 parent 38e54e4d
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 15 additions and 4 deletions   Show diff stats
configure.ac
  Diff comments   View file @73409a6
... ... @@ -69,6 +69,7 @@ DBG_CFLAGS="-g -fstack-check -DDEBUG=1"
69 69 RLS_CFLAGS="-DNDEBUG=1"
70 70 PLUGINS=""
71 71 APP_RESOURCES=""
  72 +APP_LDFLAGS=""
72 73  
73 74 dnl ---------------------------------------------------------------------------
74 75 dnl Check for OS specifics
... ... @@ -87,6 +88,7 @@ case "$host" in
87 88 DLLPREFIX=""
88 89 DLLEXT=".dll"
89 90 APP_RESOURCES="resources.rc"
  91 + APP_LDFLAGS="-mwindows"
90 92  
91 93 DBG_CFLAGS="-DDEBUG=1"
92 94 RLS_CFLAGS="-DNDEBUG=1"
... ... @@ -144,6 +146,8 @@ AC_SUBST(EXEEXT)
144 146 AC_SUBST(DLLPREFIX)
145 147 AC_SUBST(DLLEXT)
146 148 AC_SUBST(APP_RESOURCES)
  149 +AC_SUBST(APP_LDFLAGS)
  150 +
147 151  
148 152 dnl ---------------------------------------------------------------------------
149 153 dnl Check for other programs
... ...
locale/pw3270.pot
  Diff comments   View file @73409a6
... ... @@ -9,7 +9,7 @@ msgstr ""
9 9 "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
10 10 "Project-Id-Version: PACKAGE VERSION\n"
11 11 "Report-Msgid-Bugs-To: \n"
12   -"POT-Creation-Date: 2017-02-01 10:41-0200\n"
  12 +"POT-Creation-Date: 2017-02-01 14:51-0200\n"
13 13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14 14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
15 15 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -20,7 +20,7 @@ msgstr &quot;&quot;
20 20 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
21 21 "Project-Id-Version: PACKAGE VERSION\n"
22 22 "Report-Msgid-Bugs-To: \n"
23   -"POT-Creation-Date: 2017-02-01 10:41-0200\n"
  23 +"POT-Creation-Date: 2017-02-01 14:51-0200\n"
24 24 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
25 25 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
26 26 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
src/pw3270/Makefile.in
  Diff comments   View file @73409a6
... ... @@ -83,6 +83,7 @@ CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ \
83 83  
84 84 LIBS=@LIBS@ @LIBSSL_LIBS@ @GTK_LIBS@ @LIB3270_LIBS@
85 85 LDFLAGS=@LDFLAGS@
  86 +APP_LDFLAGS=@APP_LDFLAGS@
86 87  
87 88 #---[ Rules ]----------------------------------------------------------------------------
88 89  
... ... @@ -134,7 +135,8 @@ $(BASEDIR)/.obj/Release/%.a: \
134 135  
135 136 @$(MAKE) -C $(basename $(notdir $@)) $@
136 137  
137   -$(POTDIR)/%.pot: %.c
  138 +$(POTDIR)/%.pot: \
  139 + %.c
138 140  
139 141 @echo $(notdir $@) ...
140 142 @$(MKDIR) `dirname $@`
... ... @@ -150,6 +152,11 @@ $(POTDIR)/%.pot: %.c
150 152 @touch $@
151 153  
152 154 $(POTDIR)/%.pot: \
  155 + %.rc
  156 +
  157 + @touch $@
  158 +
  159 +$(POTDIR)/%.pot: \
153 160 ./%/*
154 161  
155 162 @$(MAKE) -C $(basename $(notdir $@)) $@
... ... @@ -182,7 +189,7 @@ $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@: \
182 189 $(BINRLS)/$(LIBNAME) \
183 190 $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJRLS)/$(SRC).o)
184 191  
185   - @$(LD) -o $@ $^ -L$(BINRLS) $(LIBS) -l@PACKAGE_TARNAME@
  192 + @$(LD) $(APP_LDFLAGS) -o $@ $^ -L$(BINRLS) $(LIBS) -l@PACKAGE_TARNAME@
186 193  
187 194 $(BINRLS)/$(LIBNAME): \
188 195 $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@
... ...