Commit 261e0f3ea0f91b5e0397ce17a6aed15c2ad34322

Authored by perry.werneck@gmail.com
1 parent 2d23cf45

Incluindo arquivo .rc na montagem do pacote para garantir que o icone windows fique ok

@@ -102,6 +102,7 @@ OBJEXT=".o" @@ -102,6 +102,7 @@ OBJEXT=".o"
102 EXEEXT="" 102 EXEEXT=""
103 DLLPREFIX="lib" 103 DLLPREFIX="lib"
104 PLUGINS="" 104 PLUGINS=""
  105 +APP_GUI_SRC=""
105 106
106 if test $host != $build; then 107 if test $host != $build; then
107 AC_CHECK_PROGS(HOST_CC, gcc cc) 108 AC_CHECK_PROGS(HOST_CC, gcc cc)
@@ -126,6 +127,7 @@ case "$host" in @@ -126,6 +127,7 @@ case "$host" in
126 DBGCMDPREFIX="" 127 DBGCMDPREFIX=""
127 LDARCH="" 128 LDARCH=""
128 PLUGINS="remotectl" 129 PLUGINS="remotectl"
  130 + APP_GUI_SRC="resources.rc"
129 ;; 131 ;;
130 132
131 *-apple-*) 133 *-apple-*)
@@ -298,6 +300,7 @@ AC_SUBST(DBGRPATH) @@ -298,6 +300,7 @@ AC_SUBST(DBGRPATH)
298 AC_SUBST(DBGCMDPREFIX) 300 AC_SUBST(DBGCMDPREFIX)
299 AC_SUBST(LDARCH) 301 AC_SUBST(LDARCH)
300 AC_SUBST(PLUGINS) 302 AC_SUBST(PLUGINS)
  303 +AC_SUBST(APP_GUI_SRC)
301 304
302 #--[ Headers ]------------------------------------------------------------------------------------------------------------------------------------------------ 305 #--[ Headers ]------------------------------------------------------------------------------------------------------------------------------------------------
303 306
@@ -5,7 +5,7 @@ msgid "" @@ -5,7 +5,7 @@ msgid ""
5 msgstr "" 5 msgstr ""
6 "Project-Id-Version: pw3270 5.0\n" 6 "Project-Id-Version: pw3270 5.0\n"
7 "Report-Msgid-Bugs-To: \n" 7 "Report-Msgid-Bugs-To: \n"
8 -"POT-Creation-Date: 2012-09-14 19:47-0300\n" 8 +"POT-Creation-Date: 2012-09-15 13:07-0300\n"
9 "PO-Revision-Date: 2012-09-14 14:32-0300\n" 9 "PO-Revision-Date: 2012-09-14 14:32-0300\n"
10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n" 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 "Language-Team: Português <perry.werneck@gmail.com>\n" 11 "Language-Team: Português <perry.werneck@gmail.com>\n"
@@ -262,6 +262,9 @@ @@ -262,6 +262,9 @@
262 <Unit filename="src\pw3270\print.c"> 262 <Unit filename="src\pw3270\print.c">
263 <Option compilerVar="CC" /> 263 <Option compilerVar="CC" />
264 </Unit> 264 </Unit>
  265 + <Unit filename="src\pw3270\resources.rc">
  266 + <Option compilerVar="WINDRES" />
  267 + </Unit>
265 <Unit filename="src\pw3270\tools.c"> 268 <Unit filename="src\pw3270\tools.c">
266 <Option compilerVar="CC" /> 269 <Option compilerVar="CC" />
267 </Unit> 270 </Unit>
src/pw3270/Makefile.in
@@ -45,9 +45,9 @@ INSTALL=@INSTALL@ @@ -45,9 +45,9 @@ INSTALL=@INSTALL@
45 INSTALL_PROGRAM=$(INSTALL) -m 755 45 INSTALL_PROGRAM=$(INSTALL) -m 755
46 INSTALL_DATA=$(INSTALL) -m 644 46 INSTALL_DATA=$(INSTALL) -m 644
47 CONVERT=@CONVERT@ 47 CONVERT=@CONVERT@
  48 +WINDRES=@WINDRES@
48 LN_S=@LN_S@ 49 LN_S=@LN_S@
49 50
50 -  
51 #---[ Sources ]---------------------------------------------------------------- 51 #---[ Sources ]----------------------------------------------------------------
52 52
53 include common/sources.mak 53 include common/sources.mak
@@ -56,7 +56,7 @@ include uiparser/sources.mak @@ -56,7 +56,7 @@ include uiparser/sources.mak
56 56
57 #---[ Targets ]---------------------------------------------------------------- 57 #---[ Targets ]----------------------------------------------------------------
58 58
59 -APP_SOURCES= main.c plugin.c 59 +APP_SOURCES= main.c plugin.c @APP_GUI_SRC@
60 60
61 LIB_SOURCES= window.c actions.c fonts.c dialog.c print.c colors.c \ 61 LIB_SOURCES= window.c actions.c fonts.c dialog.c print.c colors.c \
62 filetransfer.c tools.c \ 62 filetransfer.c tools.c \
@@ -82,6 +82,20 @@ ifneq ($(CONVERT),no) @@ -82,6 +82,20 @@ ifneq ($(CONVERT),no)
82 @$(CONVERT) $< --format=png > $@ 82 @$(CONVERT) $< --format=png > $@
83 endif 83 endif
84 84
  85 +%@OBJEXT@: %.rc
  86 + @echo " RC `basename $@`"
  87 + @mkdir -p `dirname $@`
  88 + @$(WINDRES) --include-dir=. -i $< -o $@
  89 +
  90 +$(OBJDBG)/%@OBJEXT@: %.rc
  91 + @echo " RC `basename $@`"
  92 + @mkdir -p `dirname $@`
  93 + @$(WINDRES) --include-dir=. -i $< -o $@
  94 +
  95 +$(OBJRLS)/%@OBJEXT@: %.rc
  96 + @echo " RC `basename $@`"
  97 + @mkdir -p `dirname $@`
  98 + @$(WINDRES) --include-dir=. -i $< -o $@
85 99
86 #---[ Release targets ]-------------------------------------------------------- 100 #---[ Release targets ]--------------------------------------------------------
87 101
src/pw3270/resources.rc 0 → 100644
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
  1 +LANGUAGE 0, 0
  2 +100 ICON pw3270.ico