From 20d89dd425bffdc594a4a7e3ebdb1cac28d12082 Mon Sep 17 00:00:00 2001 From: Eric Galvan Date: Wed, 20 Mar 2024 22:50:35 -0700 Subject: [PATCH] directory restructure, .sln inclusion --- .gitignore | 2 -- emu-api.sln | 31 ++++++++++++++++++++++++ emu-api.vcxproj | 16 ++++++------ EmuBase.cpp => emu/EmuBase.cpp | 0 EmuBase.h => emu/EmuBase.h | 0 EmuConfigMgr.cpp => emu/EmuConfigMgr.cpp | 0 EmuConfigMgr.h => emu/EmuConfigMgr.h | 0 EmuConsole.cpp => emu/EmuConsole.cpp | 0 EmuConsole.h => emu/EmuConsole.h | 0 EmuControls.cpp => emu/EmuControls.cpp | 0 EmuControls.h => emu/EmuControls.h | 0 EmuLoader.cpp => emu/EmuLoader.cpp | 0 EmuMain.cpp => emu/EmuMain.cpp | 0 EmuMain.h => emu/EmuMain.h | 0 EmuScriptMgr.cpp => emu/EmuScriptMgr.cpp | 0 EmuScriptMgr.h => emu/EmuScriptMgr.h | 0 test_visibility.emu | 9 ------- 17 files changed, 39 insertions(+), 19 deletions(-) create mode 100644 emu-api.sln rename EmuBase.cpp => emu/EmuBase.cpp (100%) rename EmuBase.h => emu/EmuBase.h (100%) rename EmuConfigMgr.cpp => emu/EmuConfigMgr.cpp (100%) rename EmuConfigMgr.h => emu/EmuConfigMgr.h (100%) rename EmuConsole.cpp => emu/EmuConsole.cpp (100%) rename EmuConsole.h => emu/EmuConsole.h (100%) rename EmuControls.cpp => emu/EmuControls.cpp (100%) rename EmuControls.h => emu/EmuControls.h (100%) rename EmuLoader.cpp => emu/EmuLoader.cpp (100%) rename EmuMain.cpp => emu/EmuMain.cpp (100%) rename EmuMain.h => emu/EmuMain.h (100%) rename EmuScriptMgr.cpp => emu/EmuScriptMgr.cpp (100%) rename EmuScriptMgr.h => emu/EmuScriptMgr.h (100%) delete mode 100644 test_visibility.emu diff --git a/.gitignore b/.gitignore index b7f0776..08b8d73 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -*.sln *.ncb *.suo .vs/ @@ -7,6 +6,5 @@ GooseTek/ Release/ Debug/ *.vcxproj.user -*.vcxproj.filters *.pdb *.dll \ No newline at end of file diff --git a/emu-api.sln b/emu-api.sln new file mode 100644 index 0000000..a1d70b9 --- /dev/null +++ b/emu-api.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.8.34330.188 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emu-api", "emu-api.vcxproj", "{E2E6DB61-31AA-4B38-BE64-7F75FF1161B4}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E2E6DB61-31AA-4B38-BE64-7F75FF1161B4}.Debug|x64.ActiveCfg = Debug|x64 + {E2E6DB61-31AA-4B38-BE64-7F75FF1161B4}.Debug|x64.Build.0 = Debug|x64 + {E2E6DB61-31AA-4B38-BE64-7F75FF1161B4}.Debug|x86.ActiveCfg = Debug|Win32 + {E2E6DB61-31AA-4B38-BE64-7F75FF1161B4}.Debug|x86.Build.0 = Debug|Win32 + {E2E6DB61-31AA-4B38-BE64-7F75FF1161B4}.Release|x64.ActiveCfg = Release|x64 + {E2E6DB61-31AA-4B38-BE64-7F75FF1161B4}.Release|x64.Build.0 = Release|x64 + {E2E6DB61-31AA-4B38-BE64-7F75FF1161B4}.Release|x86.ActiveCfg = Release|Win32 + {E2E6DB61-31AA-4B38-BE64-7F75FF1161B4}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {4E79A69F-B089-473E-9F52-27CD17EE5964} + EndGlobalSection +EndGlobal diff --git a/emu-api.vcxproj b/emu-api.vcxproj index c659295..e77a61b 100644 --- a/emu-api.vcxproj +++ b/emu-api.vcxproj @@ -95,7 +95,7 @@ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true stdcpp17 - $(ProjectDir);$(ProjectDir)deps;$(ProjectDir)deps\lua54;$(ProjectDir)reimp;$(ProjectDir)resources;$(ProjectDir)deps\detours;$(ProjectDir)deps\simpleini; + $(ProjectDir);$(ProjectDir)deps;$(ProjectDir)deps\lua54;$(ProjectDir)reimp;$(ProjectDir)resources;$(ProjectDir)deps\detours;$(ProjectDir)deps\simpleini;$(ProjectDir)emu; Disabled /utf-8 %(AdditionalOptions) @@ -140,13 +140,13 @@ - - - - - - - + + + + + + + diff --git a/EmuBase.cpp b/emu/EmuBase.cpp similarity index 100% rename from EmuBase.cpp rename to emu/EmuBase.cpp diff --git a/EmuBase.h b/emu/EmuBase.h similarity index 100% rename from EmuBase.h rename to emu/EmuBase.h diff --git a/EmuConfigMgr.cpp b/emu/EmuConfigMgr.cpp similarity index 100% rename from EmuConfigMgr.cpp rename to emu/EmuConfigMgr.cpp diff --git a/EmuConfigMgr.h b/emu/EmuConfigMgr.h similarity index 100% rename from EmuConfigMgr.h rename to emu/EmuConfigMgr.h diff --git a/EmuConsole.cpp b/emu/EmuConsole.cpp similarity index 100% rename from EmuConsole.cpp rename to emu/EmuConsole.cpp diff --git a/EmuConsole.h b/emu/EmuConsole.h similarity index 100% rename from EmuConsole.h rename to emu/EmuConsole.h diff --git a/EmuControls.cpp b/emu/EmuControls.cpp similarity index 100% rename from EmuControls.cpp rename to emu/EmuControls.cpp diff --git a/EmuControls.h b/emu/EmuControls.h similarity index 100% rename from EmuControls.h rename to emu/EmuControls.h diff --git a/EmuLoader.cpp b/emu/EmuLoader.cpp similarity index 100% rename from EmuLoader.cpp rename to emu/EmuLoader.cpp diff --git a/EmuMain.cpp b/emu/EmuMain.cpp similarity index 100% rename from EmuMain.cpp rename to emu/EmuMain.cpp diff --git a/EmuMain.h b/emu/EmuMain.h similarity index 100% rename from EmuMain.h rename to emu/EmuMain.h diff --git a/EmuScriptMgr.cpp b/emu/EmuScriptMgr.cpp similarity index 100% rename from EmuScriptMgr.cpp rename to emu/EmuScriptMgr.cpp diff --git a/EmuScriptMgr.h b/emu/EmuScriptMgr.h similarity index 100% rename from EmuScriptMgr.h rename to emu/EmuScriptMgr.h diff --git a/test_visibility.emu b/test_visibility.emu deleted file mode 100644 index b62056f..0000000 --- a/test_visibility.emu +++ /dev/null @@ -1,9 +0,0 @@ -function emu_run() - local gen = general() - local entity = gen:getSelectedEntity() - - if entity != 0 then - local selentity = BFEntity(entity) - selentity:visibility(false) -end -