nullworks/cathook
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update submodules, add g++7 support

Browse Source
This commit is contained in:
nullifiedcat 2017-12-09 18:05:18 +03:00
parent 9968d9c7c9
commit 7ce39de0c3
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cproject
View File

@ -116,7 +116,7 @@
</toolChain>
</folderInfo>
<sourceEntries>
<entry excluding="cmdui|autogen|segvcatch|xoverlay|include|classinfo|vtables|ipc|ncc|memory|hooks|sdk|imgui|src|freetype-gl|copypasted|source-sdk-2013|targeting|gui|mem" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
<entry excluding="cmdui|autogen|segvcatch|xoverlay|include|classinfo|vtables|ipc|ncc|memory|hooks|sdk|imgui|src|freetype-gl|copypasted|targeting|gui|mem" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
<entry excluding="reclasses|hacks|copypasted|visual|gui|classinfo|hooks|sdk" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include/classinfo"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include/copypasted"/>

2
.settings/language.settings.xml
View File

@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1458930107369195498" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1524654426860045198" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>

1
TODO
View File

@ -2,7 +2,6 @@
1. Bring back some sort of GUI (at least ImGUI)
2. Proper `scripts/menu`
3. Fix GLEZ not working for some (shader error)
4. Locate most of the crashes
5. Make it catbot compatible

2
libglez

@ -1 +1 @@
Subproject commit c0f714373c4cabfb6593198679facd3f4db08eaf
Subproject commit dd1055e0e900d942619f036742659225515d127a

2
libxoverlay

@ -1 +1 @@
Subproject commit 58c1b2a45c63f09bea1ecbcf486349881fbd4a82
Subproject commit 72ecdb8a808caeac7c676efac845d815f16dd923

4
makefile
View File

@ -60,8 +60,8 @@ LDFLAGS=-shared -L$(realpath $(LIB_DIR))
SOURCES=$(shell find $(SRC_DIR) -name "*.c*" -print)
ifndef CLANG
CXX=$(shell sh -c "which g++-6 || which g++")
CC=$(shell sh -c "which gcc-6 || which gcc")
CXX=$(shell sh -c "which g++-7 || which g++-6 || which g++")
CC=$(shell sh -c "which gcc-7 || which g++-6 || which gcc")
LD=$(CXX)
LDFLAGS+=-m32 -fno-gnu-unique
else

1
scripts/libs.txt Normal file
View File

@ -0,0 +1 @@
libssl-dev:i386 libsdl2-dev libfreetype6-dev libfreetype6-dev:i386 libglew-dev libglew-dev:i386

2
source-sdk-2013

@ -1 +1 @@
Subproject commit 0d8dceea4310fde5706b3ce1c70609d72a38efdf
Subproject commit 039cf5f936d8d5ffe71a127fddc376dd8d53cc65

2
src/visual/drawing.cpp
View File

@ -84,7 +84,7 @@ void draw::Initialize()
{
g_IEngine->GetScreenSize(draw::width, draw::height);
}
fonts::main_font = draw_api::create_font(DATA_PATH "/fonts/tahoma.ttf", 14);
fonts::main_font = draw_api::create_font(DATA_PATH "/fonts/verasans.ttf", 14);
}
bool draw::EntityCenterToScreen(CachedEntity *entity, Vector &out)