Download as
Browse Code »

Commit 0616c0f3839e86fad7a1f3e42d61c7d1089d3b96

Authored by Perry Werneck
1 parent 53f56c48
Exists in master and in 1 other branch develop

Fixing package.

Showing 4 changed files with 26 additions and 41 deletions   Show diff stats
1 .bin 1 .bin
2 .obj 2 .obj
  3 +.pot
3 *.bak 4 *.bak
4 *.depend 5 *.depend
5 *.layout 6 *.layout
@@ -187,6 +187,29 @@ Release: \ @@ -187,6 +187,29 @@ Release: \
187 $(BINRLS)/$(MODULE_NAME)@DLLEXT@ \ 187 $(BINRLS)/$(MODULE_NAME)@DLLEXT@ \
188 $(BINRLS)/$(PACKAGE_NAME)d@EXEEXT@ 188 $(BINRLS)/$(PACKAGE_NAME)d@EXEEXT@
189 189
  190 +$(BINRLS)/$(MODULE_NAME)@DLLEXT@: \
  191 + $(foreach SRC, $(basename $(PLUGIN_SOURCES)), $(OBJRLS)/$(SRC).o) \
  192 + $(BINRLS)/lib$(MODULE_NAME).a
  193 +
  194 + @$(MKDIR) $(@D)
  195 + @echo $< ...
  196 + @$(LD) \
  197 + -shared -Wl,-soname,$(@F) \
  198 + -o $@ \
  199 + $(LDFLAGS) \
  200 + $(foreach SRC, $(basename $(PLUGIN_SOURCES)), $(OBJRLS)/$(SRC).o) \
  201 + -L$(BINRLS) -l$(MODULE_NAME) \
  202 + $(V3270_LIBS) \
  203 + $(LIBS) \
  204 + $(GTK_LIBS)
  205 +
  206 +$(BINRLS)/lib$(MODULE_NAME).a: \
  207 + $(foreach SRC, $(basename $(CORE_SOURCES)), $(OBJRLS)/$(SRC).o)
  208 +
  209 + @$(MKDIR) $(@D)
  210 + @echo $< ...
  211 +
  212 + @$(AR) rcs $@ $^
190 213
191 214
192 #---[ Install Targets ]------------------------------------------------------------------ 215 #---[ Install Targets ]------------------------------------------------------------------
@@ -74,30 +74,20 @@ dnl --------------------------------------------------------------------------- @@ -74,30 +74,20 @@ dnl ---------------------------------------------------------------------------
74 DLLPREFIX="lib" 74 DLLPREFIX="lib"
75 75
76 case "$host" in 76 case "$host" in
77 - *-mingw32) 77 + *-mingw32|*-pc-msys)
78 app_cv_osname="windows" 78 app_cv_osname="windows"
79 CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600" 79 CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600"
80 LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32" 80 LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32"
81 - LDFLAGS="$LDFLAGS -pthread -static-libgcc -static-libstdc++" 81 + LDFLAGS="$LDFLAGS -pthread"
82 DLLEXT=".dll" 82 DLLEXT=".dll"
83 DLLPREFIX="" 83 DLLPREFIX=""
84 84
85 app_win32_revision=$(date +%y.%m.%d.%H) 85 app_win32_revision=$(date +%y.%m.%d.%H)
86 AC_SUBST(WIN32_VERSION,$app_win32_revision) 86 AC_SUBST(WIN32_VERSION,$app_win32_revision)
87 - AC_CONFIG_FILES(src/core/windows/resources.rc)  
88 AC_CONFIG_FILES(src/service/windows/resources.rc) 87 AC_CONFIG_FILES(src/service/windows/resources.rc)
89 AC_CONFIG_FILES(src/plugin/windows/resources.rc) 88 AC_CONFIG_FILES(src/plugin/windows/resources.rc)
90 ;; 89 ;;
91 90
92 - s390x-*)  
93 - CFLAGS="$CFLAGS -pthread"  
94 - LDFLAGS="$LDFLAGS -pthread"  
95 - app_cv_datadir="/usr/share"  
96 - app_cv_confdir="/etc"  
97 - app_cv_osname="linux"  
98 - LOGDIR="/var/log"  
99 - ;;  
100 -  
101 *) 91 *)
102 CFLAGS="$CFLAGS -pthread" 92 CFLAGS="$CFLAGS -pthread"
103 LDFLAGS="$LDFLAGS -pthread" 93 LDFLAGS="$LDFLAGS -pthread"
src/core/windows/resources.rc.in
View file @53f56c4
@@ -1,29 +0,0 @@ @@ -1,29 +0,0 @@
1 -#include <windows.h>  
2 -  
3 -VS_VERSION_INFO VERSIONINFO  
4 -FILEVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,0  
5 -PRODUCTVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,0  
6 -  
7 -BEGIN  
8 -  
9 - BLOCK "StringFileInfo"  
10 - BEGIN  
11 - BLOCK "080904E4"  
12 - BEGIN  
13 - VALUE "FileDescription", "@PACKAGE_DESCRIPTION@\0"  
14 - VALUE "CompanyName", "Banco do Brasil S/A.\0"  
15 - VALUE "FileVersion", "@WIN32_VERSION@\0"  
16 - VALUE "LegalCopyright", "(C) 2017 Banco do Brasil S/A. All Rights Reserved\0"  
17 - VALUE "OriginalFilename", "@PACKAGE_TARNAME@@DLLEXT@\0"  
18 - VALUE "ProductName", "@PACKAGE_NAME@\0"  
19 - VALUE "ProductVersion", "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.0\0"  
20 - END  
21 - END  
22 -  
23 - BLOCK "VarFileInfo"  
24 - BEGIN  
25 - VALUE "Translation", 0x809, 0x04E4  
26 - END  
27 -  
28 -END  
29 -