Browse Source

Add mingw-std-threads and our mingw-compat headers for windows

Signed-off-by: falkTX <falktx@falktx.com>
pull/28/head
falkTX 2 years ago
parent
commit
a474a7170e
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
9 changed files with 52 additions and 1 deletions
  1. +1
    -1
      LICENSE
  2. +12
    -0
      bootstrap-common.sh
  3. +6
    -0
      mingw-compat/condition_variable
  4. +6
    -0
      mingw-compat/future
  5. +6
    -0
      mingw-compat/invoke
  6. +6
    -0
      mingw-compat/mutex
  7. +6
    -0
      mingw-compat/shared_mutex
  8. +6
    -0
      mingw-compat/thread
  9. +3
    -0
      setup/versions.sh

+ 1
- 1
LICENSE View File

@@ -1,4 +1,4 @@
Copyright (C) 2012-2021 Filipe Coelho <falktx@falktx.com>
Copyright (C) 2012-2023 Filipe Coelho <falktx@falktx.com>


Permission to use, copy, modify, and/or distribute this software for any purpose with Permission to use, copy, modify, and/or distribute this software for any purpose with
or without fee is hereby granted, provided that the above copyright notice and this or without fee is hereby granted, provided that the above copyright notice and this


+ 12
- 0
bootstrap-common.sh View File

@@ -290,3 +290,15 @@ if [ "${MACOS}" -eq 0 ]; then
fi fi


# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------
# mingw-std-threads (download, win32 only)

if [ "${WIN32}" -eq 1 ]; then
git_clone mingw-std-threads "${MINGW_STD_THREADS_VERSION}" "${MINGW_STD_THREADS_URL}"
if [ ! -e "${PAWPAW_BUILDDIR}/mingw-std-threads-${MINGW_STD_THREADS_VERSION}/.stamp-installed" ]; then
install -m 644 "${PAWPAW_BUILDDIR}/mingw-std-threads-${MINGW_STD_THREADS_VERSION}"/mingw.*.h "${PAWPAW_PREFIX}/include/"
install -m 644 "${PAWPAW_ROOT}/mingw-compat"/* "${PAWPAW_PREFIX}/include/"
touch "${PAWPAW_BUILDDIR}/mingw-std-threads-${MINGW_STD_THREADS_VERSION}/.stamp-installed"
fi
fi

# ---------------------------------------------------------------------------------------------------------------------

+ 6
- 0
mingw-compat/condition_variable View File

@@ -0,0 +1,6 @@
// Copyright 2023 Filipe Coelho <falktx@falktx.com>
// SPDX-License-Identifier: 0BSD OR ISC

#pragma once
#include_next <condition_variable>
#include "mingw.condition_variable.h"

+ 6
- 0
mingw-compat/future View File

@@ -0,0 +1,6 @@
// Copyright 2023 Filipe Coelho <falktx@falktx.com>
// SPDX-License-Identifier: 0BSD OR ISC

#pragma once
#include_next <future>
#include "mingw.future.h"

+ 6
- 0
mingw-compat/invoke View File

@@ -0,0 +1,6 @@
// Copyright 2023 Filipe Coelho <falktx@falktx.com>
// SPDX-License-Identifier: 0BSD OR ISC

#pragma once
#include_next <invoke>
#include "mingw.invoke.h"

+ 6
- 0
mingw-compat/mutex View File

@@ -0,0 +1,6 @@
// Copyright 2023 Filipe Coelho <falktx@falktx.com>
// SPDX-License-Identifier: 0BSD OR ISC

#pragma once
#include_next <mutex>
#include "mingw.mutex.h"

+ 6
- 0
mingw-compat/shared_mutex View File

@@ -0,0 +1,6 @@
// Copyright 2023 Filipe Coelho <falktx@falktx.com>
// SPDX-License-Identifier: 0BSD OR ISC

#pragma once
#include_next <shared_mutex>
#include "mingw.shared_mutex.h"

+ 6
- 0
mingw-compat/thread View File

@@ -0,0 +1,6 @@
// Copyright 2023 Filipe Coelho <falktx@falktx.com>
// SPDX-License-Identifier: 0BSD OR ISC

#pragma once
#include_next <thread>
#include "mingw.thread.h"

+ 3
- 0
setup/versions.sh View File

@@ -37,6 +37,9 @@ LIBSNDFILE_URL=https://github.com/libsndfile/libsndfile/releases/download/${LIBS
LIBSAMPLERATE_VERSION=0.1.9 LIBSAMPLERATE_VERSION=0.1.9
LIBSAMPLERATE_URL=http://www.mega-nerd.com/SRC LIBSAMPLERATE_URL=http://www.mega-nerd.com/SRC


MINGW_STD_THREADS_VERSION=6c2061b7da41d6aa1b2162ff4383ec3ece864bc6
MINGW_STD_THREADS_URL=https://github.com/meganz/mingw-std-threads.git

ZLIB_VERSION=cacf7f1d4e3d44d871b605da3b647f07d718623f # 1.2.11 ZLIB_VERSION=cacf7f1d4e3d44d871b605da3b647f07d718623f # 1.2.11
ZLIB_URL=https://github.com/madler/zlib.git ZLIB_URL=https://github.com/madler/zlib.git




Loading…
Cancel
Save