ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2024-11-10 07:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

strtod exists in bg_lib.c now so Q_isanumber will work in the VMs, too.

Browse source
This commit is contained in:
Thilo Schulz 2011-03-11 13:51:36 +00:00
parent a9830934ba
commit 641256f7f0
2 changed files with 63 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

101
Makefile
View file

@ -111,6 +111,10 @@ ifndef GENERATE_DEPENDENCIES
GENERATE_DEPENDENCIES=1 GENERATE_DEPENDENCIES=1
endif endif
ifndef USE_SYSTEM_JPEG
USE_SYSTEM_JPEG=1
endif
ifndef USE_OPENAL ifndef USE_OPENAL
USE_OPENAL=1 USE_OPENAL=1
endif endif
@ -176,7 +180,7 @@ BLIBDIR=$(MOUNT_DIR)/botlib
NDIR=$(MOUNT_DIR)/null NDIR=$(MOUNT_DIR)/null
UIDIR=$(MOUNT_DIR)/ui UIDIR=$(MOUNT_DIR)/ui
Q3UIDIR=$(MOUNT_DIR)/q3_ui Q3UIDIR=$(MOUNT_DIR)/q3_ui
JPDIR=$(MOUNT_DIR)/jpeg-6b JPDIR=$(MOUNT_DIR)/jpeg-8c
SPEEXDIR=$(MOUNT_DIR)/libspeex SPEEXDIR=$(MOUNT_DIR)/libspeex
ZDIR=$(MOUNT_DIR)/zlib ZDIR=$(MOUNT_DIR)/zlib
Q3ASMDIR=$(MOUNT_DIR)/tools/asm Q3ASMDIR=$(MOUNT_DIR)/tools/asm
@ -265,6 +269,10 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu"))
CLIENT_CFLAGS = $(SDL_CFLAGS) CLIENT_CFLAGS = $(SDL_CFLAGS)
SERVER_CFLAGS = SERVER_CFLAGS =
ifeq ($(USE_SYSTEM_JPEG),1)
BASE_CFLAGS += -DUSE_SYSTEM_JPEG=1
endif
ifeq ($(USE_OPENAL),1) ifeq ($(USE_OPENAL),1)
CLIENT_CFLAGS += -DUSE_OPENAL CLIENT_CFLAGS += -DUSE_OPENAL
ifeq ($(USE_OPENAL_DLOPEN),1) ifeq ($(USE_OPENAL_DLOPEN),1)
@ -334,6 +342,10 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu"))
CLIENT_LIBS=$(SDL_LIBS) -lGL CLIENT_LIBS=$(SDL_LIBS) -lGL
ifeq ($(USE_SYSTEM_JPEG),1)
CLIENT_LIBS += -ljpeg
endif
ifeq ($(USE_OPENAL),1) ifeq ($(USE_OPENAL),1)
ifneq ($(USE_OPENAL_DLOPEN),1) ifneq ($(USE_OPENAL_DLOPEN),1)
CLIENT_LIBS += -lopenal CLIENT_LIBS += -lopenal
@ -1398,43 +1410,6 @@ Q3OBJ = \
$(B)/client/l_precomp.o \ $(B)/client/l_precomp.o \
$(B)/client/l_script.o \ $(B)/client/l_script.o \
$(B)/client/l_struct.o \ $(B)/client/l_struct.o \
\
$(B)/client/jcapimin.o \
$(B)/client/jcapistd.o \
$(B)/client/jccoefct.o \
$(B)/client/jccolor.o \
$(B)/client/jcdctmgr.o \
$(B)/client/jchuff.o \
$(B)/client/jcinit.o \
$(B)/client/jcmainct.o \
$(B)/client/jcmarker.o \
$(B)/client/jcmaster.o \
$(B)/client/jcomapi.o \
$(B)/client/jcparam.o \
$(B)/client/jcphuff.o \
$(B)/client/jcprepct.o \
$(B)/client/jcsample.o \
$(B)/client/jdapimin.o \
$(B)/client/jdapistd.o \
$(B)/client/jdatasrc.o \
$(B)/client/jdcoefct.o \
$(B)/client/jdcolor.o \
$(B)/client/jddctmgr.o \
$(B)/client/jdhuff.o \
$(B)/client/jdinput.o \
$(B)/client/jdmainct.o \
$(B)/client/jdmarker.o \
$(B)/client/jdmaster.o \
$(B)/client/jdpostct.o \
$(B)/client/jdsample.o \
$(B)/client/jdtrans.o \
$(B)/client/jerror.o \
$(B)/client/jfdctflt.o \
$(B)/client/jidctflt.o \
$(B)/client/jmemmgr.o \
$(B)/client/jmemnobs.o \
$(B)/client/jutils.o \
\
$(B)/client/tr_animation.o \ $(B)/client/tr_animation.o \
$(B)/client/tr_backend.o \ $(B)/client/tr_backend.o \
$(B)/client/tr_bsp.o \ $(B)/client/tr_bsp.o \
@ -1472,6 +1447,56 @@ Q3OBJ = \
$(B)/client/con_log.o \ $(B)/client/con_log.o \
$(B)/client/sys_main.o $(B)/client/sys_main.o
ifneq ($(USE_SYSTEM_JPEG),1)
Q3OBJ += \
$(B)/client/jaricom.o \
$(B)/client/jcapimin.o \
$(B)/client/jcapistd.o \
$(B)/client/jcarith.o \
$(B)/client/jccoefct.o \
$(B)/client/jccolor.o \
$(B)/client/jcdctmgr.o \
$(B)/client/jchuff.o \
$(B)/client/jcinit.o \
$(B)/client/jcmainct.o \
$(B)/client/jcmarker.o \
$(B)/client/jcmaster.o \
$(B)/client/jcomapi.o \
$(B)/client/jcparam.o \
$(B)/client/jcprepct.o \
$(B)/client/jcsample.o \
$(B)/client/jctrans.o \
$(B)/client/jdapimin.o \
$(B)/client/jdapistd.o \
$(B)/client/jdarith.o \
$(B)/client/jdatadst.o \
$(B)/client/jdatasrc.o \
$(B)/client/jdcoefct.o \
$(B)/client/jdcolor.o \
$(B)/client/jddctmgr.o \
$(B)/client/jdhuff.o \
$(B)/client/jdinput.o \
$(B)/client/jdmainct.o \
$(B)/client/jdmarker.o \
$(B)/client/jdmaster.o \
$(B)/client/jdmerge.o \
$(B)/client/jdpostct.o \
$(B)/client/jdsample.o \
$(B)/client/jdtrans.o \
$(B)/client/jerror.o \
$(B)/client/jfdctflt.o \
$(B)/client/jfdctfst.o \
$(B)/client/jfdctint.o \
$(B)/client/jidctflt.o \
$(B)/client/jidctfst.o \
$(B)/client/jidctint.o \
$(B)/client/jmemmgr.o \
$(B)/client/jmemnobs.o \
$(B)/client/jquant1.o \
$(B)/client/jquant2.o \
$(B)/client/jutils.o
endif
ifeq ($(ARCH),i386) ifeq ($(ARCH),i386)
Q3OBJ += \ Q3OBJ += \
$(B)/client/snd_mixa.o \ $(B)/client/snd_mixa.o \

5
code/qcommon/q_shared.c
View file

@ -705,10 +705,6 @@ char* Q_strrchr( const char* string, int c )
qboolean Q_isanumber( const char *s ) qboolean Q_isanumber( const char *s )
{ {
#ifdef Q3_VM
//FIXME: implement
return qfalse;
#else
char *p; char *p;
double d; double d;
@ -718,7 +714,6 @@ qboolean Q_isanumber( const char *s )
d = strtod( s, &p ); d = strtod( s, &p );
return *p == '\0'; return *p == '\0';
#endif
} }
qboolean Q_isintegral( float f ) qboolean Q_isintegral( float f )