fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

minor fixes

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5228 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2018-03-24 08:33:03 +00:00
parent 7f2c356133
commit 876eb0cf39
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
engine/Makefile
View file

@ -167,7 +167,8 @@ USER_TARGET:=$(FTE_TARGET)
DROID_PACKSU?= $(BASE_DIR)/droid/fte.cfg $(BASE_DIR)/droid/default.fmf $(BASE_DIR)/droid/configs/touch.cfg DROID_PACKSU?= $(BASE_DIR)/droid/fte.cfg $(BASE_DIR)/droid/default.fmf $(BASE_DIR)/droid/configs/touch.cfg
ANDROID_HOME?=~/android-sdk-linux ANDROID_HOME?=~/android-sdk-linux
#ANDROID_NDK_ROOT?=~/android-ndk-r8e #ANDROID_NDK_ROOT?=~/android-ndk-r8e
ANDROID_NDK_ROOT?=$(ANDROID_HOME)/ndk-bundle #ANDROID_NDK_ROOT?=$(ANDROID_HOME)/ndk-bundle
ANDROID_NDK_ROOT=$(ANDROID_HOME)/android-ndk-r14b
ANDROID_ZIPALIGN?=$(ZIPALIGN) ANDROID_ZIPALIGN?=$(ZIPALIGN)
ANDROID_ZIPALIGN?=$(ANDROID_HOME)/tools/zipalign ANDROID_ZIPALIGN?=$(ANDROID_HOME)/tools/zipalign
ANT?=ant ANT?=ant

1
engine/client/snd_al.c
View file

@ -73,7 +73,6 @@ We also have no doppler with WebAudio.
#ifdef FTE_TARGET_WEB //emscripten sucks. #ifdef FTE_TARGET_WEB //emscripten sucks.
AL_API void (AL_APIENTRY alSpeedOfSound)( ALfloat value ) {} AL_API void (AL_APIENTRY alSpeedOfSound)( ALfloat value ) {}
#define alGetError() alGetError(NULL)
#endif #endif
#else #else

4
engine/common/bothdefs.h
View file

@ -437,6 +437,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#if !defined(_WIN32) || (defined(_MSC_VER) && (_MSC_VER < 1300)) || defined(FTE_SDL) #if !defined(_WIN32) || (defined(_MSC_VER) && (_MSC_VER < 1300)) || defined(FTE_SDL)
#undef HAVE_WINSSPI #undef HAVE_WINSSPI
#endif #endif
//subservers only has code for win32 threads and linux
#if !((defined(_WIN32) && !defined(FTE_SDL) && !defined(WINRT)) || (defined(__linux__) && !defined(ANDROID) && !defined(FTE_SDL)))
#undef SUBSERVERS
#endif
#ifndef HAVE_MIXER #ifndef HAVE_MIXER
//disable various sound drivers if we can't use them anyway. //disable various sound drivers if we can't use them anyway.

2
engine/vk/vk_init.c
View file

@ -77,7 +77,7 @@ static struct vk_rendertarg_cube vk_rt_cubemap;
qboolean VK_SCR_GrabBackBuffer(void); qboolean VK_SCR_GrabBackBuffer(void);
#ifdef __linux__ #if defined(__linux__) && defined(__GLIBC__)
#include <execinfo.h> #include <execinfo.h>
#define DOBACKTRACE() \ #define DOBACKTRACE() \
do { \ do { \