dubey/tview
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
Tanishq Dubey
2024-06-14 19:28:48 -04:00
parent 1d54148b3e
commit a7aefc10ec
2 changed files with 285 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -25,7 +25,7 @@ LINUX_GL_LIBS = -lGL
CXXFLAGS = -std=c++20 -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends
CXXFLAGS += -DIMGUI_DEFINE_MATH_OPERATORS -Ofast
LIBS =
LIBS = -lexiv2
##---------------------------------------------------------------------
## OPENGL ES
@ -44,9 +44,9 @@ LIBS =
ifeq ($(UNAME_S), Linux) #LINUX
ECHO_MESSAGE = "Linux"
LIBS += $(LINUX_GL_LIBS) -ldl `sdl2-config --libs`
LIBS += $(LINUX_GL_LIBS) -ldl -L/usr/lib -lSDL2
CXXFLAGS += `sdl2-config --cflags`
CXXFLAGS += -I/usr/include/SDL2 -D_REENTRANT
CFLAGS = $(CXXFLAGS)
endif