ensl/NS
0
0
Fork 0
mirror of https://github.com/ENSL/NS.git synced 2024-11-24 21:41:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'fmoraw/linux' into develop

Browse source 
Add fmoraw's libpng include to fix PNG issue.

Use external png library since:
- Only version 12 works
- Ubuntus libpng:i386 does not work due dep. problems
This commit is contained in:
Ari Timonen 2018-04-22 18:43:06 +03:00
commit 9c3245fc8d
4 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main/source/dlls/sound.cpp
View file

@ -1549,7 +1549,7 @@ void TEXTURETYPE_Init()
char buffer[512];
int i, j;
byte *pMemFile;
int fileSize, filePos;
int fileSize = 0, filePos = 0;
if (fTextureTypeInit)
return;

2
main/source/linux/Makefile.hl_cdll
View file

@ -27,7 +27,7 @@ HL1_SERVER_OBJ_DIR=$(HL1_OBJ_DIR)/server
CFLAGS=$(BASE_CFLAGS) $(ARCH_CFLAGS) -DCLIENT_DLL -I/usr/include/malloc -D_snwprintf=swprintf -DAVH_CLIENT -DUSE_OLDAUTH -DAVH_NO_NEXUS -DNDEBUG -DASSERT=assert -Dsprintf_s=snprintf -DDISABLE_VEC_FUNCS -DDISABLE_VEC_ORIGIN
INCLUDEDIRS= -I$(HL_SRC_DIR) -I$(NS_MOD_SRC_DIR) -I$(COMMON_SRC_DIR) -I$(PUBLIC_SRC_DIR) -I$(PM_SHARED_SRC_DIR) -I../engine -I$(GAME_SHARED_SRC_DIR) -I../external/ -I../particles -I../includes/fmodapi375linux/api/inc -I$(HL_SERVER_SRC_DIR) -I$(HL_SRC_DIR)/cl_dll -I$(VGUI_INCLUDE_DIR) -I$(UI_INCLUDE_DIR) -I$(UTIL_SRC_DIR) -I../ -I../includes/fmodapi375linux/api
INCLUDEDIRS= -I$(HL_SRC_DIR) -I$(NS_MOD_SRC_DIR) -I$(COMMON_SRC_DIR) -I$(PUBLIC_SRC_DIR) -I$(PM_SHARED_SRC_DIR) -I../engine -I$(GAME_SHARED_SRC_DIR) -I../external/ -I../particles -I../includes/fmodapi375linux/api/inc -I$(HL_SERVER_SRC_DIR) -I$(HL_SRC_DIR)/cl_dll -I$(VGUI_INCLUDE_DIR) -I$(UI_INCLUDE_DIR) -I$(UTIL_SRC_DIR) -I../ -I../includes/fmodapi375linux/api -I../includes/lpng1251
ifeq ($(OS),Darwin)
LDFLAGS=$(SHLIBLDFLAGS) $(CPP_LIB) -framework Carbon $(CFG)/vgui.dylib -L. -lSDL2-2.0.0

2
main/source/pm_shared/pm_shared.cpp
View file

@ -1687,7 +1687,7 @@ void PM_InitTextureTypes()
char buffer[512];
int i, j;
byte *pMemFile;
int fileSize, filePos;
int fileSize = 0, filePos = 0;
static qboolean bTextureTypeInit = false;
if ( bTextureTypeInit )

5
main/source/ui/ChatPanel.h
View file

@ -7,16 +7,11 @@
#include "vgui_defaultinputsignal.h"
#include "AvHFont.h"
//@2014 added keycode
#include <string>
//@2014
#include <SDL2/SDL_events.h> //#define VK_ESCAPE 0x1B
#include <SDL2/SDL_keyboard.h> //#define VK_RETURN 0x0D
#include <SDL2/SDL_keycode.h> //#define VK_CAPITAL 0x14
//#define VK_LCONTROL 0xA2
//#define VK_RCONTROL 0xA3
class ChatPanel : public vgui::Panel, public vgui::CDefaultInputSignal
{