Download as
Browse Code »

Commit 99b7ef4ddde2ec097dabcdda1128c48af54427b3

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

Fixing msys2 windows builds.

Showing 3 changed files with 12 additions and 11 deletions   Show diff stats
@@ -52,8 +52,9 @@ Compiling for Windows (With MSYS2) @@ -52,8 +52,9 @@ Compiling for Windows (With MSYS2)
52 52
53 * Get installer from https://www.msys2.org/ 53 * Get installer from https://www.msys2.org/
54 * Run "pacman -Syu" repeatedly 54 * Run "pacman -Syu" repeatedly
  55 + * Add c:\msys64\usr\bin and c:\msys64\mingw64\bin to system path
55 56
56 2. Install devel packages 57 2. Install devel packages
57 58
58 - * pacman -S --needed mingw-w64-x86_64-toolchain automake autoconf make 59 + * pacman -S --needed mingw-w64-x86_64-toolchain automake autoconf make git
59 60
src/lib3270++/Makefile.in
  Diff comments   View file @99b7ef4
@@ -187,7 +187,7 @@ $(BINRLS)/$(LIBNAME)@DLLEXT@: \ @@ -187,7 +187,7 @@ $(BINRLS)/$(LIBNAME)@DLLEXT@: \
187 @echo $< ... 187 @echo $< ...
188 @rm -f $@ 188 @rm -f $@
189 @$(LN_S) \ 189 @$(LN_S) \
190 - $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ \ 190 + $^ \
191 $@ 191 $@
192 192
193 $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \ 193 $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \
@@ -195,7 +195,7 @@ $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \ @@ -195,7 +195,7 @@ $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \
195 195
196 @rm -f $@ 196 @rm -f $@
197 @$(LN_S) \ 197 @$(LN_S) \
198 - $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \ 198 + $^ \
199 $@ 199 $@
200 200
201 $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ 201 $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
@@ -341,7 +341,7 @@ $(BINDBG)/$(LIBNAME)@DLLEXT@: \ @@ -341,7 +341,7 @@ $(BINDBG)/$(LIBNAME)@DLLEXT@: \
341 @echo $< ... 341 @echo $< ...
342 @rm -f $@ 342 @rm -f $@
343 @$(LN_S) \ 343 @$(LN_S) \
344 - $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ \ 344 + $^ \
345 $@ 345 $@
346 346
347 $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \ 347 $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \
@@ -349,7 +349,7 @@ $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \ @@ -349,7 +349,7 @@ $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \
349 349
350 @rm -f $@ 350 @rm -f $@
351 @$(LN_S) \ 351 @$(LN_S) \
352 - $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \ 352 + $^ \
353 $@ 353 $@
354 354
355 $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ 355 $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
src/lib3270/Makefile.in
  Diff comments   View file @99b7ef4
@@ -188,7 +188,7 @@ $(BINRLS)/$(LIBNAME)@DLLEXT@: \ @@ -188,7 +188,7 @@ $(BINRLS)/$(LIBNAME)@DLLEXT@: \
188 @echo $< ... 188 @echo $< ...
189 @rm -f $@ 189 @rm -f $@
190 @$(LN_S) \ 190 @$(LN_S) \
191 - $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ \ 191 + $^ \
192 $@ 192 $@
193 193
194 $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \ 194 $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \
@@ -196,7 +196,7 @@ $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \ @@ -196,7 +196,7 @@ $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \
196 196
197 @rm -f $@ 197 @rm -f $@
198 @$(LN_S) \ 198 @$(LN_S) \
199 - $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \ 199 + $^ \
200 $@ 200 $@
201 201
202 $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ 202 $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
@@ -238,8 +238,8 @@ install-shared: \ @@ -238,8 +238,8 @@ install-shared: \
238 238
239 239
240 @$(LN_S) \ 240 @$(LN_S) \
241 - $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \  
242 $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ 241 $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@
  242 + $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \
243 243
244 @$(LN_S) \ 244 @$(LN_S) \
245 $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ \ 245 $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ \
@@ -360,8 +360,8 @@ $(BINDBG)/$(LIBNAME)@DLLEXT@: \ @@ -360,8 +360,8 @@ $(BINDBG)/$(LIBNAME)@DLLEXT@: \
360 360
361 @echo $< ... 361 @echo $< ...
362 @rm -f $@ 362 @rm -f $@
363 - @$(LN_S) \  
364 - $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ \ 363 + $(LN_S) \
  364 + $^ \
365 $@ 365 $@
366 366
367 $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \ 367 $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \
@@ -369,7 +369,7 @@ $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \ @@ -369,7 +369,7 @@ $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \
369 369
370 @rm -f $@ 370 @rm -f $@
371 @$(LN_S) \ 371 @$(LN_S) \
372 - $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \ 372 + $^ \
373 $@ 373 $@
374 374
375 $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ 375 $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \