change glez/xoverlay location to be in include/visual

This commit is contained in:
nullifiedcat 2017-12-11 18:24:36 +03:00
parent 99a0f8171f
commit 00490fb4a0
5 changed files with 2 additions and 5 deletions

View File

@ -135,7 +135,6 @@
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/hacks/ac"/> <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/hacks/ac"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/reclasses"/> <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/reclasses"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/visual"/> <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/visual"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="xoverlay"/>
</sourceEntries> </sourceEntries>
</configuration> </configuration>
</storageModule> </storageModule>

View File

@ -10,8 +10,8 @@
#include <thread> #include <thread>
extern "C" { extern "C" {
#include "glez.h" #include "visual/glez.h"
#include "xoverlay.h" #include "visual/xoverlay.h"
} }
#define draw_api drawex::api #define draw_api drawex::api

View File

@ -99,8 +99,6 @@ CXXFLAGS+=$(WARNING_FLAGS)
endif endif
ifeq ($(ENABLE_VISUALS),1) ifeq ($(ENABLE_VISUALS),1)
INCLUDES+=-Ixoverlay
LDFLAGS+=-L$(realpath libglez/bin32) -L$(realpath libxoverlay/bin32)
LDLIBS+=-lssl -l:libSDL2-2.0.so.0 -l:libGLEW.so -lglez -lxoverlay LDLIBS+=-lssl -l:libSDL2-2.0.so.0 -l:libGLEW.so -lglez -lxoverlay
CXXFLAGS+=$(shell sdl2-config --cflags) CXXFLAGS+=$(shell sdl2-config --cflags)
CFLAGS+=$(shell sdl2-config --cflags) CFLAGS+=$(shell sdl2-config --cflags)