From ccf9edee93bdf998e61711f0aad555fbfacc3e98 Mon Sep 17 00:00:00 2001 From: Redacted Date: Sat, 24 Feb 2024 07:46:40 -0500 Subject: [PATCH 1/5] Update CMakeLists.txt Version downgrade --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index db6b628..75537d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.27) +cmake_minimum_required(VERSION 3.18) project(Event VERSION 1.0 LANGUAGES CXX From 576d51ac68ffb1cc881683773709c8cf3c91fd84 Mon Sep 17 00:00:00 2001 From: Redacted Date: Mon, 13 May 2024 21:09:21 -0400 Subject: [PATCH 2/5] Windows main statement --- .gitignore | 2 ++ main.cpp | 9 +++++++++ 2 files changed, 11 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2f88b18 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/cmake-build-debug +/.idea diff --git a/main.cpp b/main.cpp index a85b2ea..4a6dfee 100644 --- a/main.cpp +++ b/main.cpp @@ -28,3 +28,12 @@ int main() { return 0; } + +#ifdef _WIN32 +extern "C" { + int wmain(int argc, wchar_t* argv[]) { + return main(0, nullptr); + } +} +#endif + From d9e0931a4d5d5f3a4d68503f1b716554d7d50c48 Mon Sep 17 00:00:00 2001 From: Redacted Date: Tue, 21 May 2024 13:40:35 -0400 Subject: [PATCH 3/5] Update CMakeLists.txt --- CMakeLists.txt | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 75537d0..49d8187 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,20 +10,19 @@ endif() set(CMAKE_CXX_STANDARD 20) -if (WIN32) - set(CMAKE_CXX_FLAGS "-municode") -endif() - file(GLOB_RECURSE SOURCES "src/*.cpp") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake") include_directories("include") -add_library(Event SHARED ${SOURCES} - src/Event.cpp - include/EventConnection.h - src/EventConnection.cpp) +if (UNIX) + add_library(Event SHARED ${SOURCES}) +endif() + +if (WIN32) + add_library(Event STATIC ${SOURCES}) +endif() set_target_properties(Event PROPERTIES LINKER_LANGUAGE CXX) From 7620b9f06fc6cdc06254128eeeabcf7c53f818f6 Mon Sep 17 00:00:00 2001 From: Redacted Date: Tue, 21 May 2024 13:45:25 -0400 Subject: [PATCH 4/5] Update main.cpp Fix oof --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 4a6dfee..9bc1498 100644 --- a/main.cpp +++ b/main.cpp @@ -32,7 +32,7 @@ int main() { #ifdef _WIN32 extern "C" { int wmain(int argc, wchar_t* argv[]) { - return main(0, nullptr); + return main(); } } #endif From 27af86ebf2c559b9b95e2feac8c2eacf440d2c6d Mon Sep 17 00:00:00 2001 From: Redacted Date: Sat, 1 Jun 2024 19:32:26 -0400 Subject: [PATCH 5/5] Update Event.h --- include/Event.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/Event.h b/include/Event.h index 86355a5..c16328e 100644 --- a/include/Event.h +++ b/include/Event.h @@ -2,13 +2,14 @@ /// @description Templated Event Hook Class modeled after C# events /// @author Josh O'Leary - Redacted Software /// @revision 3 -/// @lastedit 2024-02-21 +/// @lastedit 2024-06-01 /// @license Unlicense - Public Domain #pragma once #include #include +#include // TODO: Document & Explain this