From 4745e2b79bc83b41128fa76721955f7c9fb83c9b Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 17 Aug 2005 08:50:17 +0000 Subject: [PATCH] Fix compile under x64_32. --- src/osgPlugins/xine/GNUmakefile | 8 ++++++-- src/osgPlugins/xine/video_out_rgb.c | 5 ----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/osgPlugins/xine/GNUmakefile b/src/osgPlugins/xine/GNUmakefile index 21f7c0fe8..05b7200f0 100644 --- a/src/osgPlugins/xine/GNUmakefile +++ b/src/osgPlugins/xine/GNUmakefile @@ -11,8 +11,12 @@ INC += $(XINE_INCLUDES) LIBS += $(OSG_LIBS) $(XINE_LIBS) $(OTHER_LIBS) -CFLAGS += -fPIC -CXXFLAGS += -fPIC +ifeq ($(ARCH),64) + CFLAGS += -fPIC + CXXFLAGS += -fPIC +else + CFLAGS += -DCOMPILE_ASSEMBLY +endif TARGET_BASENAME = xine include $(TOPDIR)/Make/cygwin_plugin_def diff --git a/src/osgPlugins/xine/video_out_rgb.c b/src/osgPlugins/xine/video_out_rgb.c index d93bd1067..fd15a55a5 100644 --- a/src/osgPlugins/xine/video_out_rgb.c +++ b/src/osgPlugins/xine/video_out_rgb.c @@ -56,11 +56,6 @@ static int s_debugMessages = 0; -#if !defined(__ia64__) && !defined(__x86_64__) - #define COMPILE_ASSEMBLY -#endif - - #define EVAL(exp) \ {\ if(!(exp))\