Fix compile under x64_32.

2005-08-17 08:50:17 +00:00
parent b04e09c8b8
commit 4745e2b79b
2 changed files with 6 additions and 7 deletions
--- 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
--- 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))\