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

Fix Windows build #1021

Merged
merged 4 commits into from
Jan 5, 2017
Merged

Fix Windows build #1021

merged 4 commits into from
Jan 5, 2017

Commits on Jan 5, 2017

  1. Fix Windows Build 

    There is a usage of S_ISLNK in check_rc_sys.c, which breaks the linking
on Windows since this functionality isn't availble on Windows. This
commit adds a compile time check for a WIN32 platform and removes the
code if necessary.
    Yvan Janssens committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    32ae1c2 View commit details
    Browse the repository at this point in the history

  2. Fix Windows Build 

    This commit fixes the Windows build again. The mingw headers
(https://github.com/Alexpux/mingw-w64/blob/master/mingw-w64-headers/crt/_mingw_secapi.h)
check if the MINGW_HAS_SECURE_API define is 1, so just defining it isn't
enough; this will result in a compile-time error.

This commit defines the define to 1 instead of nothing.
    Yvan Janssens committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    1b32f6b View commit details
    Browse the repository at this point in the history

  3. Fix Window Build 

    This commit adds Windows-specific build output to the .gitignore file,
since the current one causes the source tree to be polluted with build
output.
    Yvan Janssens committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    1474469 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1 from friedkiwi/fix_windows_build 

    This PR fixes the following Windows-related build issues:

S_ISLNK usage
S_ISLNK isn't a supported call on Windows due to the lack of filesystem links like they exist on Unix-based systems. Other parts of the code properly check if WIN32 is defined, however, one piece was overlooked. This is fixed in one of the commits in this PR.

MINGW_HAS_SECURE_API Incorrectly Used
The MINGW_HAS_SECURE_API was used incorrectly and broke the Windows build - the correct usage is to define this to '1' instead of just defining it, as evident in the mingw headers.

Add Windows-specific output to .gitignore
Some of the build output files aren't added to the .gitignore, causing a potential source tree pollution when committing to the repository. Most notably, there was no exclusion for *.exe and *.dll files, while there was an exclusion for .so files. This discrepancy has been corrected.
    @friedkiwi
    friedkiwi authored Jan 5, 2017
    Configuration menu
    Copy the full SHA
    218ab22 View commit details
    Browse the repository at this point in the history