Skip to content

Commit

Permalink
Removed some more MinGW stuff.
Browse files Browse the repository at this point in the history
  • Loading branch information
gvanem committed Nov 1, 2023
1 parent 4fcad96 commit 7ff8d73
Show file tree
Hide file tree
Showing 4 changed files with 1,206 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gnu-make.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v2

- name: GNU-make
run: make -f Makefile.MinGW FORTIFY_SOURCE=0 USE_DEBUG=0 USE_64BIT=1 -C ./src
run: make -f Makefile.Windows CC=cl USE_DEBUG=0 -C ./src

- name: Run tests
run: set INCLUDE=%INCLUDE%;c:\hostedtoolcache\windows\Python\3.9.10\include & set COLUMNS=120 & .\appveyor-script.bat test
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# EnvTool v1.4:

[![Build Status](https://ci.appveyor.com/api/projects/status/github/gvanem/envtool?branch=master&svg=true&pendingText=MSVC%20build%20-%20Pending&passingText=MSVC%20build%20-%20OK)](https://ci.appveyor.com/project/gvanem/envtool)
[![MinGW Build](https://github.com/gvanem/EnvTool/actions/workflows/gnu-make.yml/badge.svg)](https://github.com/gvanem/EnvTool/actions/workflows/gnu-make.yml)
[![GNU-make Build](https://github.com/gvanem/EnvTool/actions/workflows/gnu-make.yml/badge.svg)](https://github.com/gvanem/EnvTool/actions/workflows/gnu-make.yml)

A tool to search along various environment variables for files (or a wildcard). The following modes
handles these environment variables:
Expand Down Expand Up @@ -234,7 +234,7 @@ should be used instead.

---

C-source included in `./src`. Makefiles for MinGW, Cygwin, clang-cl and MSVC.
C-source included in `./src`. `Makefile.Windows` is for MSVC, clang-cl, Intel-ICX and Zig.
Enjoy!

`#include <std_disclaimer.h>`:<br>
Expand Down
3 changes: 1 addition & 2 deletions appveyor-script.bat
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
:: AppVeyor .bat-file to run "build" or "test".
::
:: Note: the 'appveyor-script.bat test' step is also used in the
:: "Github Workflow" to test the MinGW build.
:: "Github Workflow" to test the "GNU-make" build.
::
:: Do not confuse 'appveyor.yml' by the 'cd' below.
::
Expand All @@ -16,7 +16,6 @@ setlocal
:: Otherwise when running on AppVeyor:
:: Since only Python2.7 is in AppVeyor's PATH by default, add this
:: Python 3.4 (x86) to the PATH.
:: And add the path to AppVeyor's dual-mode MinGW.
::
if "%APPVEYOR_BUILD_FOLDER%" == "" set APPVEYOR_BUILD_FOLDER=%~dp0
set PATH=%PATH%;c:\Python34;c:\msys64\MinGW64\bin
Expand Down

0 comments on commit 7ff8d73

Please sign in to comment.