kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release_1.3' of https://github.com/assaultcube/AC into release_1.3

Browse Source
This commit is contained in:
drian
2021-04-03 06:03:50 +02:00
parent 91290fcfb6 d6ab406f33
commit 5aee2d62c6
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/Makefile
+1 -1
View File
@@ -50,7 +50,7 @@ CLIENT_LIBS= -mwindows -L../lib -lSDL2 -lSDL2_image -lzdll -lopengl32 -lenet -lO
else
USRLIB=$(shell if [ -e /usr/lib64 ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi)
CLIENT_INCLUDES= $(INCLUDES) -I/usr/include `sdl2-config --cflags` -idirafter ../include
CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) `sdl2-config --libs` -lSDL2_image -lz -lGL -lopenal -lvorbisfile
CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) -lX11 `sdl2-config --libs` -lSDL2_image -lz -lGL -lopenal -lvorbisfile
endif
CLIENT_OBJS= \
source/src/platform.h
+1
View File
@@ -41,6 +41,7 @@
#ifndef STANDALONE
#include <SDL.h>
#include <SDL_image.h>
#include <SDL_syswm.h>
#define GL_GLEXT_LEGACY
#define __glext_h__