Commit 481d1bfc837470ac02ef1ddc1ee7d87752d4c5af
Exists in
master
and in
3 other branches
Merge branch 'develop' of https://github.com/PerryWerneck/lib3270 into develop
Showing
1 changed file
with
33 additions
and
32 deletions
Show diff stats
README.md
@@ -20,7 +20,7 @@ Building for Linux | @@ -20,7 +20,7 @@ Building for Linux | ||
20 | 1. Get lib3270 sources from git | 20 | 1. Get lib3270 sources from git |
21 | 21 | ||
22 | ```shell | 22 | ```shell |
23 | - git clone http://softwarepublico.gov.br/gitlab/pw3270/lib3270.git ./lib3270 | 23 | + $ git clone http://softwarepublico.gov.br/gitlab/pw3270/lib3270.git ./lib3270 |
24 | ``` | 24 | ``` |
25 | 25 | ||
26 | 2. Install the required libraries | 26 | 2. Install the required libraries |
@@ -42,14 +42,13 @@ Building for Linux | @@ -42,14 +42,13 @@ Building for Linux | ||
42 | 3. Configure and build | 42 | 3. Configure and build |
43 | 43 | ||
44 | ```shell | 44 | ```shell |
45 | - ./autogen.sh | ||
46 | - make clean | ||
47 | - make all | 45 | + $ ./autogen.sh |
46 | + $ make clean | ||
47 | + $ make all | ||
48 | ``` | 48 | ``` |
49 | 49 | ||
50 | - | ||
51 | -Cross-compiling for Windows | ||
52 | -=========================== | 50 | +Building for Windows |
51 | +==================== | ||
53 | 52 | ||
54 | Cross-compiling on SuSE Linux (Native or WSL) | 53 | Cross-compiling on SuSE Linux (Native or WSL) |
55 | --------------------------------------------- | 54 | --------------------------------------------- |
@@ -57,73 +56,75 @@ Cross-compiling on SuSE Linux (Native or WSL) | @@ -57,73 +56,75 @@ Cross-compiling on SuSE Linux (Native or WSL) | ||
57 | 1. First add the MinGW Repositories for your SuSE version from: | 56 | 1. First add the MinGW Repositories for your SuSE version from: |
58 | 57 | ||
59 | ```shell | 58 | ```shell |
60 | - sudo zypper ar obs://windows:mingw:win32 mingw32 | ||
61 | - sudo zypper ar obs://windows:mingw:win64 mingw64 | ||
62 | - sudo zypper ref | 59 | + $ sudo zypper ar obs://windows:mingw:win32 mingw32 |
60 | + $ sudo zypper ar obs://windows:mingw:win64 mingw64 | ||
61 | + $ sudo zypper ref | ||
63 | ``` | 62 | ``` |
64 | 63 | ||
65 | 2. Get lib3270 sources from git | 64 | 2. Get lib3270 sources from git |
66 | 65 | ||
67 | ```shell | 66 | ```shell |
68 | - git clone https://github.com/PerryWerneck/lib3270.git ./lib3270 | 67 | + $ git clone https://github.com/PerryWerneck/lib3270.git ./lib3270 |
69 | ``` | 68 | ``` |
70 | 69 | ||
71 | 3. Install cross compilers | 70 | 3. Install cross compilers |
72 | 71 | ||
73 | ```shell | 72 | ```shell |
74 | - ./lib3270/win/install-cross.sh --all (for 32 and 64 bits) | 73 | + $ ./lib3270/win/install-cross.sh --all (for 32 and 64 bits) |
75 | ``` | 74 | ``` |
76 | 75 | ||
77 | 3. Configure build | 76 | 3. Configure build |
78 | 77 | ||
79 | ```shell | 78 | ```shell |
80 | - ./lib3270/win/win-configure.sh --64 (for 64 bits) | 79 | + $ ./lib3270/win/win-configure.sh --64 (for 64 bits) |
81 | ``` | 80 | ``` |
82 | 81 | ||
83 | 4. Build | 82 | 4. Build |
84 | 83 | ||
85 | ```shell | 84 | ```shell |
86 | - cd lib3270 | ||
87 | - make clean | ||
88 | - make all | 85 | + $ cd lib3270 |
86 | + $ make clean | ||
87 | + $ make all | ||
89 | ``` | 88 | ``` |
90 | 89 | ||
91 | -Compiling for Windows (With MSYS2) | ||
92 | ----------------------------------- | 90 | +Windows native with MSYS2 |
91 | +------------------------- | ||
92 | + | ||
93 | +1. Install and update MSYS2 | ||
93 | 94 | ||
94 | -1. Install MSYS2 | 95 | + * Download and install msys2 from https://www.msys2.org/ (Don't forget to update the package database and core system packages) |
96 | + | ||
97 | +2. Update system path | ||
95 | 98 | ||
96 | - * Download and install msys2 from https://www.msys2.org/ | ||
97 | - * Open a msys2 terminal and run "pacman -Syu" repeatedly | ||
98 | * Add c:\msys64\usr\bin and c:\msys64\mingw64\bin to system path | 99 | * Add c:\msys64\usr\bin and c:\msys64\mingw64\bin to system path |
99 | 100 | ||
100 | -2. Install devel packages | 101 | +3. Install devel packages |
101 | 102 | ||
102 | ```shell | 103 | ```shell |
103 | - pacman -S --needed mingw-w64-x86_64-gcc automake autoconf make git openssl pkg-config | 104 | + $ pacman -S --needed mingw-w64-x86_64-gcc automake autoconf make git pkg-config mingw-w64-x86_64-gettext mingw-w64-x86_64-openssl |
104 | ``` | 105 | ``` |
106 | + Afther thist close and reopen mingw shell. | ||
105 | 107 | ||
106 | -3. Get lib3270 sources from git using the mingw shell | 108 | +4. Get lib3270 sources from git using the mingw shell |
107 | 109 | ||
108 | ```shell | 110 | ```shell |
109 | - git clone https://github.com/PerryWerneck/lib3270.git ./lib3270 | 111 | + $ git clone https://github.com/PerryWerneck/lib3270.git ./lib3270 |
110 | ``` | 112 | ``` |
111 | 113 | ||
112 | -4. Build library using the mingw shell | 114 | +5. Build library using the mingw shell |
113 | 115 | ||
114 | ```shell | 116 | ```shell |
115 | - cd lib3270 | ||
116 | - ./autogen.sh | ||
117 | - make all | 117 | + $ cd lib3270 |
118 | + $ ./autogen.sh | ||
119 | + $ make all | ||
118 | ``` | 120 | ``` |
119 | 121 | ||
120 | -5. Install | 122 | +6. Install |
121 | 123 | ||
122 | ```shell | 124 | ```shell |
123 | - make install | 125 | + $ make install |
124 | ``` | 126 | ``` |
125 | 127 | ||
126 | - | ||
127 | Building for macOS (using homebrew) | 128 | Building for macOS (using homebrew) |
128 | =================================== | 129 | =================================== |
129 | 130 |