1
0
mirror of synced 2024-11-23 22:51:02 +01:00

Maybe fix gh actions

This commit is contained in:
BroGamer 2022-08-16 02:56:16 +12:00
parent 76624bd4fb
commit 40904ab35c
4 changed files with 10 additions and 5 deletions

3
.gitmodules vendored
View File

@ -7,3 +7,6 @@
[submodule "tomlc99"]
path = tomlc99
url = https://github.com/cktan/tomlc99
[submodule "mingw-std-threads"]
path = mingw-std-threads
url = https://github.com/meganz/mingw-std-threads

View File

@ -6,7 +6,7 @@ SDL_TARGET := x86_64-w64-mingw32
SRC = src/dllmain.c src/helpers.c src/poll.c src/boilerplate.c src/card.cpp tomlc99/toml.c minhook/src/buffer.c minhook/src/hook.c minhook/src/trampoline.c minhook/src/hde/hde32.c minhook/src/hde/hde64.c
OBJ = ${addprefix ${TARGET}/,${subst .cpp,.o,${SRC:.c=.o}}}
CFLAGS = -std=c99 -Iminhook/include -ISDL/${SDL_TARGET}/include -ISDL/include -Itomlc99 -Wall -Ofast -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=_WIN32_WINNT_WIN7
CXXFLAGS = -std=c++17 -Iminhook/include -ISDL/${SDL_TARGET}/include -ISDL/include -Itomlc99 -Wall -Ofast -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=_WIN32_WINNT_WIN7
CXXFLAGS = -std=c++17 -Imingw-std-threads -Iminhook/include -ISDL/${SDL_TARGET}/include -ISDL/include -Itomlc99 -Wall -Ofast -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=_WIN32_WINNT_WIN7
LDFLAGS := -shared -static -static-libgcc -s
LIBS := SDL/${SDL_TARGET}/build/.libs/libSDL2.a SDL/${SDL_TARGET}/build/.libs/libSDL2main.a -lmingw32 -luuid -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lsetupapi -lversion -pthread
DEPS = SDL

1
mingw-std-threads Submodule

@ -0,0 +1 @@
Subproject commit 6c2061b7da41d6aa1b2162ff4383ec3ece864bc6

View File

@ -1,12 +1,13 @@
#include "card.h"
#include "mingw.thread.h"
#include <thread>
using namespace std::chrono_literals;
void
attach (callbackAttach callback, i32 *data) {
std::thread t ([callback, data] () {
std::this_thread::sleep_for (250ms);
mingw_stdthread::thread t ([callback, data] () {
mingw_stdthread::this_thread::sleep_for (250ms);
callback (0, 0, data);
});
t.detach ();
@ -14,8 +15,8 @@ attach (callbackAttach callback, i32 *data) {
void
touch (callbackTouch callback, u64 data) {
std::thread t ([callback, data] () {
std::this_thread::sleep_for (250ms);
mingw_stdthread::thread t ([callback, data] () {
mingw_stdthread::this_thread::sleep_for (250ms);
u8 cardData[168]
= { 0x01, 0x01, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x92, 0x2E, 0x58, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x5C, 0x97, 0x44, 0xF0, 0x88, 0x04, 0x00, 0x43, 0x26, 0x2C, 0x33, 0x00, 0x04,