Download as
Browse Code »

Commit bbaa658c4173c5089678a7c5fdeaf556a49e8a05

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

Fixing MSYS/2 build.

Showing 4 changed files with 44 additions and 38 deletions   Show diff stats
Makefile.in
  Diff comments   View file @bbaa658
... ... @@ -84,8 +84,8 @@ install: \
84 84 install-plugin:
85 85 @$(MAKE) -C server DESTDIR=$(DESTDIR) install
86 86  
87   -install-shared:
88   - @$(MAKE) -C client DESTDIR=$(DESTDIR) install-shared
  87 +install-linux-lib:
  88 + @$(MAKE) -C client DESTDIR=$(DESTDIR) install-linux-lib
89 89  
90 90 install-static:
91 91 @$(MAKE) -C client DESTDIR=$(DESTDIR) install-static
... ... @@ -93,8 +93,8 @@ install-static:
93 93 install-devel:
94 94 @$(MAKE) -C client DESTDIR=$(DESTDIR) install-devel
95 95  
96   -install-winlib:
97   - @$(MAKE) -C client DESTDIR=$(DESTDIR) install-winlib
  96 +install-windows-lib:
  97 + @$(MAKE) -C client DESTDIR=$(DESTDIR) install-windows-lib
98 98  
99 99 doc:
100 100 @$(DOXYGEN) ./doxygen/doxyfile
... ...
README.md
  Diff comments   View file @bbaa658
... ... @@ -34,9 +34,9 @@ Cross-compiling on SuSE Linux (Native or WSL)
34 34 * https://build.opensuse.org/project/show/windows:mingw:win64
35 35 * https://build.opensuse.org/project/show/home:PerryWerneck:pw3270
36 36  
37   -2. Get libv3270 sources from git
  37 +2. Get sources from git
38 38  
39   - * git clone https://github.com/PerryWerneck/pw3270-plugin-ipc.git ./ipc3270
  39 + * git clone https://github.com/PerryWerneck/libipc3270.git ./libipc3270
40 40  
41 41 3. Install cross compilers
42 42  
... ... @@ -44,7 +44,7 @@ Cross-compiling on SuSE Linux (Native or WSL)
44 44  
45 45 4. Build
46 46  
47   - * cd ipc3270
  47 + * cd libipc3270
48 48 * make clean
49 49 * make all
50 50  
... ... @@ -60,14 +60,17 @@ Compiling for Windows (With MSYS2)
60 60  
61 61 * Follow the guide on https://github.com/PerryWerneck/libv3270
62 62  
63   -2. Get ip3270 sources from git
  63 +3. Get sources from git
64 64  
65   - * git clone https://github.com/PerryWerneck/pw3270-plugin-ipc.git ./ipc3270
  65 + * git clone https://github.com/PerryWerneck/libipc3270.git ./libipc3270
66 66  
67 67 4. Build library using the mingw shell
68 68  
69   - * cd ipc3270
  69 + * cd libipc3270
70 70 * ./autogen.sh
71 71 * make all
72 72  
  73 +5. Install
  74 +
  75 + * make install
73 76  
... ...
client/Makefile.in
  Diff comments   View file @bbaa658
... ... @@ -186,7 +186,6 @@ $(POTDIR)/$(MODULE_NAME)/%.pot: \
186 186 @$(MKDIR) $(@D)
187 187 @touch $@
188 188  
189   -
190 189 #---[ Release Targets ]------------------------------------------------------------------
191 190  
192 191 all: \
... ... @@ -226,7 +225,7 @@ $(BINRLS)/lib$(MODULE_NAME).static.a: \
226 225 install: \
227 226 $(foreach TARGET, $(TARGETS), install-$(TARGET))
228 227  
229   -install-shared: \
  228 +install-linux-lib: \
230 229 $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@
231 230  
232 231 @$(MKDIR) \
... ... @@ -244,6 +243,31 @@ install-shared: \
244 243 lib$(MODULE_NAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ \
245 244 $(DESTDIR)/$(libdir)/lib$(MODULE_NAME)@DLLEXT@
246 245  
  246 +install-windows-lib: \
  247 + $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@
  248 +
  249 + @$(MKDIR) \
  250 + $(DESTDIR)/$(bindir)
  251 +
  252 + @$(INSTALL_PROGRAM) \
  253 + $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@ \
  254 + $(DESTDIR)/$(bindir)/lib$(MODULE_NAME)@LIBEXT@
  255 +
  256 + @$(MKDIR) \
  257 + $(DESTDIR)$(libdir)
  258 +
  259 + @$(DLLTOOL) \
  260 + --input-def $(BINRLS)/lib$(MODULE_NAME).def \
  261 + --dllname lib$(MODULE_NAME).dll \
  262 + --output-lib $(DESTDIR)$(libdir)/lib$(MODULE_NAME).dll.a
  263 +
  264 + @$(MKDIR) \
  265 + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def
  266 +
  267 + @$(INSTALL_DATA) \
  268 + $(BINRLS)/lib$(MODULE_NAME).def \
  269 + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def
  270 +
247 271 install-static: \
248 272 $(BINRLS)/lib$(MODULE_NAME).static.a
249 273  
... ... @@ -283,28 +307,6 @@ install-devel:
283 307 sdk/ipc3270.pc \
284 308 $(DESTDIR)$(libdir)/pkgconfig/ipc3270.pc
285 309  
286   -install-winlib: \
287   - $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@
288   -
289   - @$(MKDIR) \
290   - $(DESTDIR)$(libdir)
291   -
292   - @$(INSTALL_DATA) \
293   - $(BINRLS)/lib$(MODULE_NAME).dll.a \
294   - $(DESTDIR)$(libdir)
295   -
296   - @$(DLLTOOL) \
297   - --input-def $(BINRLS)/lib$(MODULE_NAME).def \
298   - --dllname lib$(MODULE_NAME).dll \
299   - --output-lib $(DESTDIR)$(libdir)/lib$(MODULE_NAME).lib
300   -
301   - @$(MKDIR) \
302   - $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def
303   -
304   - @$(INSTALL_DATA) \
305   - $(BINRLS)/lib$(MODULE_NAME).def \
306   - $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def
307   -
308 310 #---[ Misc Targets ]---------------------------------------------------------------------
309 311  
310 312 $(POTDIR)/$(MODULE_NAME).pot: \
... ...
configure.ac
  Diff comments   View file @bbaa658
... ... @@ -68,7 +68,7 @@ APP_LDFLAGS=""
68 68 DLL_LDFLAGS="-shared"
69 69 CLIENT_LDFLAGS=""
70 70 CLIENT_LIBS=""
71   -CLIENT_TARGETS="shared devel"
  71 +CLIENT_TARGETS="devel"
72 72  
73 73 dnl ---------------------------------------------------------------------------
74 74 dnl Check for OS specifics
... ... @@ -80,11 +80,11 @@ case "$host" in
80 80 CFLAGS="$CFLAGS -D_WIN32_WINNT=0x0600"
81 81 LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32 -lkernel32"
82 82 LDFLAGS="$LDFLAGS"
83   - CLIENT_LDFLAGS="-shared -static-libgcc -static-libstdc++ -Wl,--output-def,\$(@D)/\lib\$(MODULE_NAME).def,--out-implib,\$(@D)/\lib\$(MODULE_NAME).dll.a"
  83 + CLIENT_LDFLAGS="-shared -static-libgcc -static-libstdc++ -Wl,--output-def,\$(@D)/\lib\$(MODULE_NAME).def"
84 84 CLIENT_LIBS="-Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive,-Bdynamic"
85 85 DLLEXT=".dll"
86   - CLIENT_TARGETS="$CLIENT_TARGETS winlib"
87 86  
  87 + CLIENT_TARGETS="windows-lib $CLIENT_TARGETS"
88 88  
89 89 app_win32_revision=$(date +%-y.%-m.%-d.%-H)
90 90 AC_SUBST(WIN32_VERSION,$app_win32_revision)
... ... @@ -111,8 +111,9 @@ case "$host" in
111 111 DLLEXT=".so"
112 112 CLIENT_LDFLAGS="-shared"
113 113  
114   - app_cv_static='no'
  114 + CLIENT_TARGETS="linux-lib $CLIENT_TARGETS"
115 115  
  116 + app_cv_static='no'
116 117  
117 118 esac
118 119  
... ...