diff options
| author | Jack Lloyd <[email protected]> | 2016-08-28 19:30:13 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2016-08-28 19:30:13 -0400 |
| commit | b3289425e59941c33643f0cf190f42ee443e022e (patch) | |
| tree | edfadbfab8d4c80a30ce450c496ec59fd693a04b | |
| parent | dca4acf0376d7b4abccbfd59e33bdec9227fbe8c (diff) | |
Make Windows happy
| -rw-r--r-- | src/lib/entropy/cryptoapi_rng/info.txt | 2 | ||||
| -rw-r--r-- | src/lib/entropy/win32_stats/info.txt | 2 | ||||
| -rwxr-xr-x | src/scripts/ci/travis/build.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/entropy/cryptoapi_rng/info.txt b/src/lib/entropy/cryptoapi_rng/info.txt index 941411f67..8aa166692 100644 --- a/src/lib/entropy/cryptoapi_rng/info.txt +++ b/src/lib/entropy/cryptoapi_rng/info.txt @@ -17,6 +17,6 @@ mingw </os> <libs> -windows -> advapi32 +windows -> advapi32.lib mingw -> advapi32 </libs> diff --git a/src/lib/entropy/win32_stats/info.txt b/src/lib/entropy/win32_stats/info.txt index c17acce58..48eb91faa 100644 --- a/src/lib/entropy/win32_stats/info.txt +++ b/src/lib/entropy/win32_stats/info.txt @@ -15,5 +15,5 @@ mingw </os> <libs> -windows -> user32 +windows -> user32.lib </libs> diff --git a/src/scripts/ci/travis/build.sh b/src/scripts/ci/travis/build.sh index 9248f382f..f2b4f2b67 100755 --- a/src/scripts/ci/travis/build.sh +++ b/src/scripts/ci/travis/build.sh @@ -95,7 +95,7 @@ if [ "${BUILD_MODE:0:6}" = "cross-" ]; then elif [ "$BUILD_MODE" = "cross-win32" ]; then CC_BIN=i686-w64-mingw32-g++ # No test prefix needed, PE executes as usual with Wine installed - CFG_FLAGS+=(--cpu=x86_32 --os=windows --cc-abi-flags="-static") + CFG_FLAGS+=(--cpu=x86_32 --os=mingw --cc-abi-flags="-static") TEST_EXE=./botan-test.exe fi fi |