Commit 692d86a9d0d68e6773e72f2768bfec698344999a
1 parent
9664af72
Exists in
master
and in
1 other branch
Fixing windows builds.
Showing
4 changed files
with
9 additions
and
3 deletions
Show diff stats
Makefile.in
| @@ -30,6 +30,7 @@ LIBNAME=libv@LIB3270_NAME@ | @@ -30,6 +30,7 @@ LIBNAME=libv@LIB3270_NAME@ | ||
| 30 | 30 | ||
| 31 | SOURCES= \ | 31 | SOURCES= \ |
| 32 | $(wildcard src/v3270/*.c) \ | 32 | $(wildcard src/v3270/*.c) \ |
| 33 | + $(wildcard src/v3270/@OSNAME@/*.rc) \ | ||
| 33 | $(wildcard src/v3270ft/*.c) \ | 34 | $(wildcard src/v3270ft/*.c) \ |
| 34 | $(wildcard src/dialogs/*.c) | 35 | $(wildcard src/dialogs/*.c) |
| 35 | 36 |
configure.ac
| @@ -85,7 +85,7 @@ case "$host" in | @@ -85,7 +85,7 @@ case "$host" in | ||
| 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 | 87 | ||
| 88 | - AC_CONFIG_FILES(src/lib3270/windows/resources.rc) | 88 | + AC_CONFIG_FILES(src/v3270/windows/resources.rc) |
| 89 | ;; | 89 | ;; |
| 90 | 90 | ||
| 91 | s390x-*) | 91 | s390x-*) |
win/mingw32-libv3270.spec
| @@ -58,7 +58,10 @@ BuildRequires: mingw32-cross-pkg-config | @@ -58,7 +58,10 @@ BuildRequires: mingw32-cross-pkg-config | ||
| 58 | BuildRequires: mingw32-filesystem | 58 | BuildRequires: mingw32-filesystem |
| 59 | BuildRequires: mingw32-libopenssl-devel | 59 | BuildRequires: mingw32-libopenssl-devel |
| 60 | BuildRequires: mingw32-zlib-devel | 60 | BuildRequires: mingw32-zlib-devel |
| 61 | + | ||
| 61 | BuildRequires: mingw32(pkg:gtk+-win32-3.0) | 62 | BuildRequires: mingw32(pkg:gtk+-win32-3.0) |
| 63 | +BuildRequires: mingw32(lib:iconv) | ||
| 64 | +BuildRequires: mingw32(lib:intl) | ||
| 62 | 65 | ||
| 63 | BuildRequires: mingw32(lib:3270) | 66 | BuildRequires: mingw32(lib:3270) |
| 64 | 67 |
win/mingw64-libv3270.spec
| @@ -59,9 +59,11 @@ BuildRequires: mingw64-filesystem | @@ -59,9 +59,11 @@ BuildRequires: mingw64-filesystem | ||
| 59 | BuildRequires: mingw64-libopenssl-devel | 59 | BuildRequires: mingw64-libopenssl-devel |
| 60 | BuildRequires: mingw64-zlib-devel | 60 | BuildRequires: mingw64-zlib-devel |
| 61 | 61 | ||
| 62 | -BuildRequires: mingw64(lib:3270) | ||
| 63 | - | ||
| 64 | BuildRequires: mingw64(pkg:gtk+-win32-3.0) | 62 | BuildRequires: mingw64(pkg:gtk+-win32-3.0) |
| 63 | +BuildRequires: mingw64(lib:iconv) | ||
| 64 | +BuildRequires: mingw64(lib:intl) | ||
| 65 | + | ||
| 66 | +BuildRequires: mingw64(lib:3270) | ||
| 65 | 67 | ||
| 66 | %description | 68 | %description |
| 67 | 69 |