Skip to content

Commit b159e82

Browse files
committed
msys2: fix build 3
1 parent 3425bb2 commit b159e82

File tree

3 files changed

+23
-3
lines changed

3 files changed

+23
-3
lines changed

src/tst/main.cpp

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,5 +87,27 @@ int main(utki::span<const char*> args)
8787
// NOLINTNEXTLINE(bugprone-exception-escape)
8888
int main(int argc, const char** argv)
8989
{
90-
return tst::main(utki::make_span(argv, argc));
90+
return tst::main(
91+
utki::make_span(
92+
argv, //
93+
argc
94+
)
95+
);
9196
}
97+
98+
#if CFG_OS == CFG_OS_WINDOWS
99+
int WINAPI WinMain(
100+
HINSTANCE h_instance, // Instance
101+
HINSTANCE h_prev_instance, // Previous Instance
102+
LPSTR lp_cmd_line, // Command Line Parameters
103+
int n_cmd_show // Window Show State
104+
)
105+
{
106+
return tst::main(
107+
utki::make_span(
108+
const_cast<const char**>(__argv), //
109+
__argc
110+
)
111+
);
112+
}
113+
#endif

tests/basic/makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ this_srcs := $(call prorab-src-dir, .)
1111
this_srcs += ../harness/testees.cpp
1212

1313
ifeq ($(os), windows)
14-
this_ldlibs += -l mingw32
1514
else
1615
this_ldflags += -rdynamic
1716
endif

tests/failed/makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ this_srcs := $(call prorab-src-dir, .)
1111
this_srcs += ../harness/testees.cpp
1212

1313
ifeq ($(os), windows)
14-
this_ldlibs += -l mingw32
1514
else
1615
this_ldflags += -rdynamic
1716
endif

0 commit comments

Comments
 (0)