Download as
Browse Code »

Commit 733e0bdaa8e93a7dbcc7a4c9ae8ca7da1efd4b54

Authored by Perry Werneck
1 parent 091ee615
Exists in master and in 3 other branches develop, macos, network_module

Ajustes para empacotamento windows

Showing 4 changed files with 12 additions and 6 deletions   Show diff stats
@@ -90,7 +90,9 @@ CFLAGS= \ @@ -90,7 +90,9 @@ CFLAGS= \
90 90
91 LIBS= \ 91 LIBS= \
92 @LIBS@ \ 92 @LIBS@ \
93 - @LIBSSL_LIBS@ 93 + @LIBSSL_LIBS@ \
  94 + @LIBICONV@ \
  95 + @INTL_LIBS@
94 96
95 #---[ Debug Rules ]---------------------------------------------------------------------- 97 #---[ Debug Rules ]----------------------------------------------------------------------
96 98
@@ -104,7 +106,6 @@ $(OBJDBG)/%.o: \ @@ -104,7 +106,6 @@ $(OBJDBG)/%.o: \
104 $(CFLAGS) \ 106 $(CFLAGS) \
105 -Wall -Wextra -fstack-check \ 107 -Wall -Wextra -fstack-check \
106 -DDEBUG=1 \ 108 -DDEBUG=1 \
107 - -DDATADIR=$(BASEDIR) \  
108 -o $@ -c $< 109 -o $@ -c $<
109 110
110 #---[ Release Rules ]-------------------------------------------------------------------- 111 #---[ Release Rules ]--------------------------------------------------------------------
@@ -118,7 +119,6 @@ $(OBJRLS)/%.o: \ @@ -118,7 +119,6 @@ $(OBJRLS)/%.o: \
118 @$(CC) \ 119 @$(CC) \
119 $(CFLAGS) \ 120 $(CFLAGS) \
120 -DNDEBUG=1 \ 121 -DNDEBUG=1 \
121 - -DDATADIR=$(datarootdir)/pw3270 \  
122 -o $@ -c $< 122 -o $@ -c $<
123 123
124 #---[ Misc Rules ]----------------------------------------------------------------------- 124 #---[ Misc Rules ]-----------------------------------------------------------------------
@@ -76,8 +76,14 @@ case &quot;$host&quot; in @@ -76,8 +76,14 @@ case &quot;$host&quot; in
76 *-mingw32) 76 *-mingw32)
77 app_cv_osname="windows" 77 app_cv_osname="windows"
78 CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600" 78 CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600"
  79 + LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32"
79 LDFLAGS="$LDFLAGS -pthread -static-libgcc -static-libstdc++" 80 LDFLAGS="$LDFLAGS -pthread -static-libgcc -static-libstdc++"
80 DLLEXT=".dll" 81 DLLEXT=".dll"
  82 +
  83 + app_win32_revision=$(date +%y.%m.%d.%H)
  84 + AC_SUBST(WIN32_VERSION,$app_win32_revision)
  85 +
  86 + AC_CONFIG_FILES(src/lib3270/windows/resources.rc)
81 ;; 87 ;;
82 88
83 s390x-*) 89 s390x-*)
@@ -103,7 +109,7 @@ esac @@ -103,7 +109,7 @@ esac
103 109
104 AC_SUBST(DATADIR,$app_cv_datadir) 110 AC_SUBST(DATADIR,$app_cv_datadir)
105 AC_SUBST(CONFDIR,$app_cv_confdir) 111 AC_SUBST(CONFDIR,$app_cv_confdir)
106 -AC_SUBST(OSNAME,$app_cv_confdir) 112 +AC_SUBST(OSNAME,$app_cv_osname)
107 AC_SUBST(LIBS) 113 AC_SUBST(LIBS)
108 AC_SUBST(LOGDIR) 114 AC_SUBST(LOGDIR)
109 AC_SUBST(DLLEXT) 115 AC_SUBST(DLLEXT)
src/lib3270/util.c
  Diff comments   View file @733e0bd
@@ -208,7 +208,7 @@ LIB3270_EXPORT const char * lib3270_win32_local_charset(void) @@ -208,7 +208,7 @@ LIB3270_EXPORT const char * lib3270_win32_local_charset(void)
208 // Reference: 208 // Reference:
209 // http://msdn.microsoft.com/en-us/library/windows/desktop/dd318070(v=vs.85).aspx 209 // http://msdn.microsoft.com/en-us/library/windows/desktop/dd318070(v=vs.85).aspx
210 210
211 - #warning TODO: Use GetACP() to identify the correct code page 211 + /// TODO: Use GetACP() to identify the correct code page
212 212
213 trace("Windows CHARSET is %u",GetACP()); 213 trace("Windows CHARSET is %u",GetACP());
214 214
src/lib3270/windows/resources.rc.in
  Diff comments   View file @733e0bd
@@ -14,7 +14,7 @@ BEGIN @@ -14,7 +14,7 @@ BEGIN
14 VALUE "CompanyName", "Banco do Brasil S/A.\0" 14 VALUE "CompanyName", "Banco do Brasil S/A.\0"
15 VALUE "FileVersion", "@WIN32_VERSION@\0" 15 VALUE "FileVersion", "@WIN32_VERSION@\0"
16 VALUE "LegalCopyright", "(C) 2017 Banco do Brasil S/A. All Rights Reserved\0" 16 VALUE "LegalCopyright", "(C) 2017 Banco do Brasil S/A. All Rights Reserved\0"
17 - VALUE "OriginalFilename", "@PACKAGE_TARNAME@.exe\0"" 17 + VALUE "OriginalFilename", "@PACKAGE_TARNAME@@DLLEXT@\0""
18 VALUE "ProductName", "@PACKAGE_NAME@\0" 18 VALUE "ProductName", "@PACKAGE_NAME@\0"
19 VALUE "ProductVersion", "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.0\0" 19 VALUE "ProductVersion", "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.0\0"
20 END 20 END