Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Some minor enhancements / update of MingW Windows build #50

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Some minor enhancements / update of MingW Windows build #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eeea199
mingw windows build: Use configure'd toolchain for win32deps.pl
cemeyer Feb 13, 2019
c143679
README: Update mingw Windows build instructions
cemeyer Feb 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ winpkg: $(bin_PROGRAMS)
cp .libs/stoken.exe winpkg/
if ENABLE_GUI
cp .libs/stoken-gui.exe winpkg/
cp `./win32deps.pl .libs/stoken-gui.exe` winpkg/
cp `CC=$(CC) ./win32deps.pl .libs/stoken-gui.exe` winpkg/
cp gui/*.{ui,png} winpkg/
else
cp .libs/stoken.exe winpkg/
Expand Down
7 changes: 3 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,18 +113,17 @@ or maintained regularly.

#### Initial setup

On a Fedora 20 PC (other versions may work as well), install the build
On a Fedora 28 PC (other versions may work as well), install the build
dependencies:

yum groupinstall "Development Tools"
yum install git autoconf automake libtool mingw32-gnutls mingw32-libxml2 mingw32-gtk3
dnf install git autoconf automake libtool mingw64-gnutls mingw64-libxml2 mingw64-gtk3 mingw64-binutils

#### Compiling

git clone git://github.com/cernekee/stoken
cd stoken
bash autogen.sh
mingw32-configure
mingw64-configure GTK_LIBS="$(x86_64-w64-mingw32-pkg-config --libs "gtk+-3.0") -Wl,--subsystem,windows"
make winpkg

If all goes well, you should be able to copy <code>winpkg.zip</code> to
Expand Down
4 changes: 2 additions & 2 deletions win32deps.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
"setupapi.dll" => 1,
);

my $CC = "i686-w64-mingw32-gcc";
my $OBJDUMP = "mingw-objdump";
my $CC = $ENV{'CC'};
my $OBJDUMP = $ENV{'OBJDUMP'} // $CC =~ s/-gcc$/-objdump/r;

sub run($)
{
Expand Down