Skip to content

Commit e6060d8

Browse files
Evasion3356Evasion3356
Evasion3356
authored and
Evasion3356
committed
Added Github build Action.
1 parent b06ab2b commit e6060d8

File tree

7 files changed

+190
-9
lines changed

7 files changed

+190
-9
lines changed

‎.github/workflows/build_release.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Build and Package M2DEScriptHook
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
branches:
9+
- master
10+
11+
jobs:
12+
build:
13+
runs-on: windows-latest
14+
15+
steps:
16+
- name: Checkout repository
17+
uses: actions/checkout@v4
18+
19+
- name: Setup MSVC environment
20+
uses: ilammy/msvc-dev-cmd@v1
21+
22+
- name: Build Solution
23+
run: |
24+
msbuild M2DEScriptHook.sln /p:Configuration=Release_Github /p:Platform=x64
25+
26+
- name: Move dxgi.dll to files folder
27+
run: |
28+
move build\Release_Github\dxgi.dll files\dxgi.dll
29+
30+
- name: Create Release.zip (Fix Nested Issue)
31+
run: |
32+
cd files
33+
powershell -Command "Compress-Archive -Path * -DestinationPath ../Release.zip -Force"
34+
35+
- name: Upload Release.zip as Artifact
36+
uses: actions/upload-artifact@v4
37+
with:
38+
name: Release
39+
path: Release.zip

‎.gitignore‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ mono_crash.*
2121
[Dd]ebugPublic/
2222
[Rr]elease/
2323
[Rr]eleases/
24-
[Rr]elease-DXGI/
25-
[Rr]elease-Logging/
26-
[Rr]eleases-Logging/
24+
[Rr]elease_Github/
2725
x64/
2826
x86/
2927
[Ww][Ii][Nn]32/

‎ExampleDLLPlugin/ExampleDLLPlugin.vcxproj‎

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
<Configuration>Debug</Configuration>
66
<Platform>x64</Platform>
77
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release_Github|x64">
9+
<Configuration>Release_Github</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
812
<ProjectConfiguration Include="Release|x64">
913
<Configuration>Release</Configuration>
1014
<Platform>x64</Platform>
@@ -29,6 +33,13 @@
2933
<CharacterSet>MultiByte</CharacterSet>
3034
<PlatformToolset>v143</PlatformToolset>
3135
</PropertyGroup>
36+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Github|x64'" Label="Configuration">
37+
<ConfigurationType>DynamicLibrary</ConfigurationType>
38+
<UseDebugLibraries>false</UseDebugLibraries>
39+
<WholeProgramOptimization>true</WholeProgramOptimization>
40+
<CharacterSet>MultiByte</CharacterSet>
41+
<PlatformToolset>v143</PlatformToolset>
42+
</PropertyGroup>
3243
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3344
<ImportGroup Label="ExtensionSettings">
3445
</ImportGroup>
@@ -38,6 +49,9 @@
3849
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
3950
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
4051
</ImportGroup>
52+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Github|x64'" Label="PropertySheets">
53+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
54+
</ImportGroup>
4155
<PropertyGroup Label="UserMacros" />
4256
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
4357
<OutDir>$(SolutionDir)build\$(Configuration)\plugins\</OutDir>
@@ -47,6 +61,10 @@
4761
<OutDir>$(SolutionDir)build\$(Configuration)\plugins\</OutDir>
4862
<IntDir>$(SolutionDir)build\$(Configuration)\tmp\$(ProjectName)\</IntDir>
4963
</PropertyGroup>
64+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Github|x64'">
65+
<OutDir>$(SolutionDir)build\$(Configuration)\plugins\</OutDir>
66+
<IntDir>$(SolutionDir)build\$(Configuration)\tmp\$(ProjectName)\</IntDir>
67+
</PropertyGroup>
5068
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
5169
<ClCompile>
5270
<WarningLevel>Level3</WarningLevel>
@@ -59,7 +77,8 @@
5977
<AdditionalDependencies>$(SolutionDir)build\$(Configuration)\dxgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
6078
</Link>
6179
<PostBuildEvent>
62-
<Command>$(SolutionDir)\copydebug.bat</Command>
80+
<Command>
81+
</Command>
6382
</PostBuildEvent>
6483
</ItemDefinitionGroup>
6584
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -77,7 +96,27 @@
7796
<AdditionalDependencies>$(SolutionDir)build\$(Configuration)\dxgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
7897
</Link>
7998
<PostBuildEvent>
80-
<Command>$(SolutionDir)\copyrelease.bat</Command>
99+
<Command>
100+
</Command>
101+
</PostBuildEvent>
102+
</ItemDefinitionGroup>
103+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Github|x64'">
104+
<ClCompile>
105+
<WarningLevel>Level4</WarningLevel>
106+
<Optimization>MaxSpeed</Optimization>
107+
<FunctionLevelLinking>true</FunctionLevelLinking>
108+
<IntrinsicFunctions>true</IntrinsicFunctions>
109+
<AdditionalIncludeDirectories>include;..\shared\include;..\vendor\LUA</AdditionalIncludeDirectories>
110+
</ClCompile>
111+
<Link>
112+
<GenerateDebugInformation>true</GenerateDebugInformation>
113+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
114+
<OptimizeReferences>true</OptimizeReferences>
115+
<AdditionalDependencies>$(SolutionDir)build\$(Configuration)\dxgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
116+
</Link>
117+
<PostBuildEvent>
118+
<Command>
119+
</Command>
81120
</PostBuildEvent>
82121
</ItemDefinitionGroup>
83122
<ItemGroup>

‎M2DEScriptHook.sln‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,26 @@ EndProject
1818
Global
1919
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2020
Debug|x64 = Debug|x64
21+
Release_Github|x64 = Release_Github|x64
2122
Release|x64 = Release|x64
2223
EndGlobalSection
2324
GlobalSection(ProjectConfigurationPlatforms) = postSolution
2425
{8D715BC3-5BBC-42E2-9F0D-29FBAFB6490B}.Debug|x64.ActiveCfg = Debug|x64
2526
{8D715BC3-5BBC-42E2-9F0D-29FBAFB6490B}.Debug|x64.Build.0 = Debug|x64
27+
{8D715BC3-5BBC-42E2-9F0D-29FBAFB6490B}.Release_Github|x64.ActiveCfg = Release_Github|x64
28+
{8D715BC3-5BBC-42E2-9F0D-29FBAFB6490B}.Release_Github|x64.Build.0 = Release_Github|x64
2629
{8D715BC3-5BBC-42E2-9F0D-29FBAFB6490B}.Release|x64.ActiveCfg = Release|x64
2730
{8D715BC3-5BBC-42E2-9F0D-29FBAFB6490B}.Release|x64.Build.0 = Release|x64
2831
{D4AAA849-F280-2B84-46B2-C9524602F05F}.Debug|x64.ActiveCfg = Debug|x64
2932
{D4AAA849-F280-2B84-46B2-C9524602F05F}.Debug|x64.Build.0 = Debug|x64
33+
{D4AAA849-F280-2B84-46B2-C9524602F05F}.Release_Github|x64.ActiveCfg = Release_Github|x64
34+
{D4AAA849-F280-2B84-46B2-C9524602F05F}.Release_Github|x64.Build.0 = Release_Github|x64
3035
{D4AAA849-F280-2B84-46B2-C9524602F05F}.Release|x64.ActiveCfg = Release|x64
3136
{D4AAA849-F280-2B84-46B2-C9524602F05F}.Release|x64.Build.0 = Release|x64
3237
{A7650B52-67CB-406C-BD46-731ED539C9FE}.Debug|x64.ActiveCfg = Debug|x64
3338
{A7650B52-67CB-406C-BD46-731ED539C9FE}.Debug|x64.Build.0 = Debug|x64
39+
{A7650B52-67CB-406C-BD46-731ED539C9FE}.Release_Github|x64.ActiveCfg = Release_Github|x64
40+
{A7650B52-67CB-406C-BD46-731ED539C9FE}.Release_Github|x64.Build.0 = Release_Github|x64
3441
{A7650B52-67CB-406C-BD46-731ED539C9FE}.Release|x64.ActiveCfg = Release|x64
3542
{A7650B52-67CB-406C-BD46-731ED539C9FE}.Release|x64.Build.0 = Release|x64
3643
EndGlobalSection

‎M2DEScriptHook/M2DEScriptHook.vcxproj‎

Lines changed: 52 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
<Configuration>Debug</Configuration>
66
<Platform>x64</Platform>
77
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release_Github|x64">
9+
<Configuration>Release_Github</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
812
<ProjectConfiguration Include="Release|x64">
913
<Configuration>Release</Configuration>
1014
<Platform>x64</Platform>
@@ -30,6 +34,13 @@
3034
<CharacterSet>MultiByte</CharacterSet>
3135
<PlatformToolset>v143</PlatformToolset>
3236
</PropertyGroup>
37+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Github|x64'" Label="Configuration">
38+
<ConfigurationType>DynamicLibrary</ConfigurationType>
39+
<UseDebugLibraries>false</UseDebugLibraries>
40+
<WholeProgramOptimization>true</WholeProgramOptimization>
41+
<CharacterSet>MultiByte</CharacterSet>
42+
<PlatformToolset>v143</PlatformToolset>
43+
</PropertyGroup>
3344
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3445
<ImportGroup Label="ExtensionSettings">
3546
</ImportGroup>
@@ -39,6 +50,9 @@
3950
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
4051
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
4152
</ImportGroup>
53+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Github|x64'" Label="PropertySheets">
54+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
55+
</ImportGroup>
4256
<PropertyGroup Label="UserMacros" />
4357
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
4458
<OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
@@ -51,6 +65,12 @@
5165
<IntDir>$(SolutionDir)build\$(Configuration)\tmp\$(ProjectName)\</IntDir>
5266
<TargetName>dxgi</TargetName>
5367
</PropertyGroup>
68+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Github|x64'">
69+
<IncludePath>C:\Users\Joel\include;$(IncludePath)</IncludePath>
70+
<OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
71+
<IntDir>$(SolutionDir)build\$(Configuration)\tmp\$(ProjectName)\</IntDir>
72+
<TargetName>dxgi</TargetName>
73+
</PropertyGroup>
5474
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
5575
<ClCompile>
5676
<WarningLevel>Level3</WarningLevel>
@@ -66,7 +86,7 @@
6686
<AdditionalDependencies>$(SolutionDir)build\$(Configuration)\lib\libudis86.lib;%(AdditionalDependencies)</AdditionalDependencies>
6787
</Link>
6888
<PostBuildEvent>
69-
<Command>"$(SolutionDir)\copydebug.bat"</Command>
89+
<Command>"$(SolutionDir)copydebug.bat"</Command>
7090
</PostBuildEvent>
7191
</ItemDefinitionGroup>
7292
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -85,7 +105,35 @@
85105
<LanguageStandard>stdcpp17</LanguageStandard>
86106
</ClCompile>
87107
<Link>
88-
<GenerateDebugInformation>true</GenerateDebugInformation>
108+
<GenerateDebugInformation>false</GenerateDebugInformation>
109+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
110+
<OptimizeReferences>true</OptimizeReferences>
111+
<IgnoreSpecificDefaultLibraries>
112+
</IgnoreSpecificDefaultLibraries>
113+
<ModuleDefinitionFile>
114+
</ModuleDefinitionFile>
115+
</Link>
116+
<PostBuildEvent>
117+
<Command>"$(SolutionDir)copyrelease.bat"</Command>
118+
</PostBuildEvent>
119+
</ItemDefinitionGroup>
120+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Github|x64'">
121+
<ClCompile>
122+
<WarningLevel>Level3</WarningLevel>
123+
<Optimization>MaxSpeed</Optimization>
124+
<FunctionLevelLinking>true</FunctionLevelLinking>
125+
<IntrinsicFunctions>true</IntrinsicFunctions>
126+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
127+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
128+
<AdditionalIncludeDirectories>include;..\shared\include;..\vendor\LUA</AdditionalIncludeDirectories>
129+
<PreprocessorDefinitions>LUA_BUILD_AS_DLL;_CRT_SECURE_NO_WARNINGS;LUA_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
130+
<StringPooling>true</StringPooling>
131+
<FloatingPointModel>Fast</FloatingPointModel>
132+
<DebugInformationFormat>None</DebugInformationFormat>
133+
<LanguageStandard>stdcpp17</LanguageStandard>
134+
</ClCompile>
135+
<Link>
136+
<GenerateDebugInformation>false</GenerateDebugInformation>
89137
<EnableCOMDATFolding>true</EnableCOMDATFolding>
90138
<OptimizeReferences>true</OptimizeReferences>
91139
<IgnoreSpecificDefaultLibraries>
@@ -94,7 +142,8 @@
94142
</ModuleDefinitionFile>
95143
</Link>
96144
<PostBuildEvent>
97-
<Command>"$(SolutionDir)\copyrelease.bat"</Command>
145+
<Command>
146+
</Command>
98147
</PostBuildEvent>
99148
</ItemDefinitionGroup>
100149
<ItemGroup>

‎M2DEScriptHook/include/M2DEScriptHook.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class M2DEScriptHook : public singleton<M2DEScriptHook>
5656
{
5757
private:
5858
bool m_bEnded = false;
59-
std::map<uint8_t, std::string> keyBinds;
59+
std::unordered_map<uint8_t, std::string> keyBinds;
6060
std::recursive_mutex _keyBindMutex;
6161

6262
uint8_t GetKeyID(const std::string& key)

‎shared/include/hooking/libudis86.vcxproj‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
<Configuration>Debug</Configuration>
66
<Platform>x64</Platform>
77
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release_Github|x64">
9+
<Configuration>Release_Github</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
812
<ProjectConfiguration Include="Release|x64">
913
<Configuration>Release</Configuration>
1014
<Platform>x64</Platform>
@@ -36,6 +40,7 @@
3640
<OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
3741
<IntDir>$(SolutionDir)build\$(Configuration)\tmp\$(ProjectName)\</IntDir>
3842
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
43+
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_Github|x64'">false</LinkIncremental>
3944
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
4045
<TargetName>$(ProjectName)</TargetName>
4146
<TargetPath>$(OutDir)lib\$(ProjectName)$(TargetExt)</TargetPath>
@@ -122,6 +127,50 @@
122127
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USING_V110_SDK71_;V8_TARGET_ARCH_X64;WIN32;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
123128
</ResourceCompile>
124129
</ItemDefinitionGroup>
130+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Github|x64'">
131+
<ClCompile>
132+
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
133+
<BufferSecurityCheck>true</BufferSecurityCheck>
134+
<CompileAsWinRT>false</CompileAsWinRT>
135+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
136+
<DisableSpecificWarnings>4355;4800;4458;4091;4456;4457;4459;4312;4351;%(DisableSpecificWarnings)</DisableSpecificWarnings>
137+
<ExceptionHandling>Sync</ExceptionHandling>
138+
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
139+
<FunctionLevelLinking>true</FunctionLevelLinking>
140+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
141+
<IntrinsicFunctions>true</IntrinsicFunctions>
142+
<MinimalRebuild>false</MinimalRebuild>
143+
<Optimization>MaxSpeed</Optimization>
144+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
145+
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USING_V110_SDK71_;V8_TARGET_ARCH_X64;WIN32;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
146+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
147+
<RuntimeTypeInfo>true</RuntimeTypeInfo>
148+
<StringPooling>true</StringPooling>
149+
<TreatWarningAsError>true</TreatWarningAsError>
150+
<WarningLevel>Level3</WarningLevel>
151+
</ClCompile>
152+
<Lib>
153+
<AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
154+
<OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile>
155+
<TargetMachine>MachineX64</TargetMachine>
156+
</Lib>
157+
<Link>
158+
<AdditionalDependencies>ws2_32.lib</AdditionalDependencies>
159+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
160+
<FixedBaseAddress>false</FixedBaseAddress>
161+
<GenerateDebugInformation>true</GenerateDebugInformation>
162+
<ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary>
163+
<MapFileName>$(OutDir)$(TargetName).map</MapFileName>
164+
<MinimumRequiredVersion>5.02</MinimumRequiredVersion>
165+
<OptimizeReferences>true</OptimizeReferences>
166+
<StackReserveSize>2097152</StackReserveSize>
167+
<SubSystem>Console</SubSystem>
168+
<TargetMachine>MachineX64</TargetMachine>
169+
</Link>
170+
<ResourceCompile>
171+
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USING_V110_SDK71_;V8_TARGET_ARCH_X64;WIN32;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
172+
</ResourceCompile>
173+
</ItemDefinitionGroup>
125174
<ItemGroup>
126175
<None Include="Shared.gyp" />
127176
</ItemGroup>

0 commit comments

Comments
 (0)