diff -Naur ez.bak/Makefile ez/Makefile --- ez.bak/Makefile 2006-11-25 13:28:35.000000000 -0500 +++ ez/Makefile 2007-07-24 00:05:37.000000000 -0400 @@ -16,8 +16,10 @@ # ARCH = x86 ppc # OS = linux darwin -ARCH = $(shell uname -m | sed -e 's/i.86/x86/g' -e 's/Power Macintosh/ppc/g') -OS = $(shell uname -s | tr A-Z a-z) +ARCH = ppc +#$(shell uname -m | sed -e 's/i.86/x86/g' -e 's/Power Macintosh/ppc/g') +OS = linux +#$(shell uname -s | tr A-Z a-z) # add special architecture based flags ifeq ($(ARCH),x86_64) @@ -27,7 +29,9 @@ ARCH_CFLAGS = -march=i686 -D__LITTLE_ENDIAN__Q__ -Did386 endif ifeq ($(ARCH),ppc) - ARCH_CFLAGS = -arch ppc -faltivec -maltivec -mcpu=7450 -mtune=7450 -mpowerpc -mpowerpc-gfxopt -D__BIG_ENDIAN__Q__ + ARCH_CFLAGS = -O2 -pipe -mtune=750 -mcpu=750 -D__BIG_ENDIAN__Q__ + #ARCH_CFLAGS= -O2 -pipe -mtune=7400 -mcpu=7400 -maltivec -mabi=altivec -fno-strict-aliasing -D__BIG_ENDIAN__Q__ + # -arch ppc -faltivec -maltivec -mcpu=7450 -mtune=7450 -mpowerpc -mpowerpc-gfxopt -D__BIG_ENDIAN__Q__ endif # TODO: LIB_PREFIX must be $(OS)-$(ARCH) @@ -61,8 +65,8 @@ GLX_TARGET = $(TYPE)-$(ARCH)/ezquake-gl.glx X11_TARGET = $(TYPE)-$(ARCH)/ezquake.x11 -SVGA_TARGET = $(TYPE)-$(ARCH)/ezquake.svga -MAC_TARGET = $(TYPE)-$(ARCH)/ezquake-gl.mac +#SVGA_TARGET = $(TYPE)-$(ARCH)/ezquake.svga +#MAC_TARGET = $(TYPE)-$(ARCH)/ezquake-gl.mac ################ @@ -71,9 +75,9 @@ BUILD = $(_E)$(CC) -o $@ $(_OBJS) $(_LDFLAGS) MKDIR = $(_E)mkdir -p $@ -################ +################ # $(SVGA_DIR) $(MAC_DIR): -$(GLX_DIR) $(X11_DIR) $(SVGA_DIR) $(MAC_DIR): +$(GLX_DIR) $(X11_DIR): $(MKDIR) # compiler flags @@ -92,9 +96,9 @@ CFLAGS = $(BASE_CFLAGS) $(DEBUG_CFLAGS) -D_DEBUG endif -LDFLAGS = -lm -lpthread -COMMON_LIBS = libs/$(LIB_PREFIX)/libpng.a libs/$(LIB_PREFIX)/libz.a libs/$(LIB_PREFIX)/libpcre.a libs/$(LIB_PREFIX)/libexpat.a libs/$(LIB_PREFIX)/libtcl8.4.a -GL_LIBS = libs/$(LIB_PREFIX)/libjpeg.a +LDFLAGS = -lm -lpthread -ljpeg -lpcre -lpng -lexpat -ltcl -lGL +#COMMON_LIBS = libs/$(LIB_PREFIX)/libpng.a libs/$(LIB_PREFIX)/libz.a libs/$(LIB_PREFIX)/libpcre.a libs/$(LIB_PREFIX)/libexpat.a libs/$(LIB_PREFIX)/libtcl8.4.a +#GL_LIBS = libs/$(LIB_PREFIX)/libjpeg.a include Makefile.list diff -Naur ez.bak/vid_glx.c ez/vid_glx.c --- ez.bak/vid_glx.c 2006-11-26 12:57:18.000000000 -0500 +++ ez/vid_glx.c 2007-07-24 00:14:29.000000000 -0400 @@ -138,8 +138,8 @@ const char *glx_extensions=NULL; -extern int glXGetVideoSyncSGI (unsigned int *); -extern int glXWaitVideoSyncSGI (int, int, unsigned int *); +int (*glXGetVideoSyncSGI) (unsigned int *); +extern void *glXGetProcAddressARB(const GLubyte *); cvar_t vid_vsync = {"vid_vsync", "0"}; @@ -567,8 +567,9 @@ double sanity_time = Sys_DoubleTime() + 0.05; unsigned int count, latest; - glXGetVideoSyncSGI(&count); + glXGetVideoSyncSGI = glXGetProcAddressARB("glXGetVideoSyncSGI"); + glXGetVideoSyncSGI(&count); while(Sys_DoubleTime() < sanity_time) { glXGetVideoSyncSGI(&latest);