Skip to content

Commit

Permalink
reorganize stuff, wildcards for build, fix module map
Browse files Browse the repository at this point in the history
  • Loading branch information
hero622 committed Aug 18, 2024
1 parent 6870301 commit b5e7b62
Show file tree
Hide file tree
Showing 13 changed files with 31 additions and 554 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "vendor/subhook"]
path = vendor/subhook
url = https://github.com/Zeex/subhook
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ OBJS=$(patsubst $(SDIR)/%.cpp, $(ODIR)/%.o, $(SRCS))
DEPS=$(OBJS:%.o=%.d)

WARNINGS=-Wall -Wno-parentheses -Wno-unknown-pragmas -Wno-delete-non-virtual-dtor
CXXFLAGS=-std=c++20 -m32 $(WARNINGS) -I$(SDIR) -fPIC -D_GNU_SOURCE -I$(SDIR)/deps/subhook
LDFLAGS=-m32 -shared -lstdc++fs -L$(SDIR)/deps/subhook -lsubhook
CXXFLAGS=-std=c++20 -m32 $(WARNINGS) -I$(SDIR) -fPIC -D_GNU_SOURCE -Ivendor
LDFLAGS=-m32 -shared -lstdc++fs

# Import config.mk, which can be used for optional config
-include config.mk
Expand Down
14 changes: 5 additions & 9 deletions example-mod/src/photon-example-mod.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,12 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="convars\convars.h" />
<ClInclude Include="huds\hud.h" />
<ClInclude Include="mod.h" />
<ClInclude Include="signals\signals.h" />
<_WildCardClCompile Include=".\**\*.cpp" />
<_WildCardClInclude Include=".\**\*.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="convars\convars.cpp" />
<ClCompile Include="huds\hud.cpp" />
<ClCompile Include="mod.cpp" />
<ClCompile Include="signals\signals.cpp" />
<ClCompile Include="@(_WildCardClCompile)" />
<ClInclude Include="@(_WildCardClInclude)" />
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion>
Expand Down Expand Up @@ -113,4 +109,4 @@
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
</Project>
</Project>
45 changes: 0 additions & 45 deletions example-mod/src/photon-example-mod.vcxproj.filters

This file was deleted.

2 changes: 1 addition & 1 deletion src/core/shared/signal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

#include "sdk/signal.h"

#include "deps/subhook/subhook.h"
#include "sdk/photon.h"

#include <subhook/subhook.h>
#include <unordered_map>

static std::unordered_map< std::string, signal_t* > signals;
Expand Down
Binary file removed src/deps/subhook/libsubhook.a
Binary file not shown.
Loading

0 comments on commit b5e7b62

Please sign in to comment.