diff options
Diffstat (limited to 'configs')
-rw-r--r-- | configs/beos | 3 | ||||
-rw-r--r-- | configs/freebsd-dri-amd64 | 3 | ||||
-rw-r--r-- | configs/freebsd-dri-x86 | 1 | ||||
-rw-r--r-- | configs/linux-directfb | 3 | ||||
-rw-r--r-- | configs/linux-dri-x86 | 1 | ||||
-rw-r--r-- | configs/linux-dri-x86-64 | 3 | ||||
-rw-r--r-- | configs/linux-icc | 3 | ||||
-rw-r--r-- | configs/linux-icc-static | 3 | ||||
-rw-r--r-- | configs/linux-solo-x86 | 1 | ||||
-rw-r--r-- | configs/linux-x86 | 3 | ||||
-rw-r--r-- | configs/linux-x86-64 | 3 | ||||
-rw-r--r-- | configs/linux-x86-glide | 3 | ||||
-rw-r--r-- | configs/linux-x86-xcb | 3 | ||||
-rw-r--r-- | configs/sunos5-gcc | 3 |
14 files changed, 25 insertions, 11 deletions
diff --git a/configs/beos b/configs/beos index 1d2eaa9..007a929 100644 --- a/configs/beos +++ b/configs/beos @@ -26,7 +26,8 @@ ifeq ($(CPU), x86) -DUSE_3DNOW_ASM \ -DUSE_SSE_ASM - ASM_SOURCES = $(X86_SOURCES) $(X86_API) + ASM_SOURCES = $(X86_SOURCES) + ASM_API = $(X86_API) CC = gcc CXX = g++ diff --git a/configs/freebsd-dri-amd64 b/configs/freebsd-dri-amd64 index ffddfd8..39341b9 100644 --- a/configs/freebsd-dri-amd64 +++ b/configs/freebsd-dri-amd64 @@ -6,4 +6,5 @@ include $(TOP)/configs/freebsd-dri CONFIG_NAME = freebsd-dri-x86-64 ASM_FLAGS = -DUSE_X86_64_ASM -ASM_SOURCES = $(X86-64_SOURCES) $(X86-64_API) +ASM_SOURCES = $(X86-64_SOURCES) +ASM_API = $(X86-64_API) diff --git a/configs/freebsd-dri-x86 b/configs/freebsd-dri-x86 index 31316b1..af0d27f 100644 --- a/configs/freebsd-dri-x86 +++ b/configs/freebsd-dri-x86 @@ -10,3 +10,4 @@ PIC_FLAGS = ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM ASM_SOURCES = $(X86_SOURCES) +ASM_API = $(X86_API) diff --git a/configs/linux-directfb b/configs/linux-directfb index f09c69d..42f7d29 100644 --- a/configs/linux-directfb +++ b/configs/linux-directfb @@ -17,7 +17,8 @@ HAVE_X86 = $(shell uname -m | grep 'i[3-6]86' >/dev/null && echo yes) ifeq ($(HAVE_X86), yes) CFLAGS += -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM CXXFLAGS += -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM - ASM_SOURCES = $(X86_SOURCES) $(X86_API) + ASM_SOURCES = $(X86_SOURCES) + ASM_API = $(X86_API) endif # Directories diff --git a/configs/linux-dri-x86 b/configs/linux-dri-x86 index bef24e0..b196004 100644 --- a/configs/linux-dri-x86 +++ b/configs/linux-dri-x86 @@ -13,4 +13,5 @@ ARCH_FLAGS = -m32 ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM ASM_SOURCES = $(X86_SOURCES) +ASM_API = $(X86_API) diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64 index affbe2b..56597d8 100644 --- a/configs/linux-dri-x86-64 +++ b/configs/linux-dri-x86-64 @@ -8,7 +8,8 @@ CONFIG_NAME = linux-dri-x86-64 ARCH_FLAGS = -m64 ASM_FLAGS = -DUSE_X86_64_ASM -ASM_SOURCES = $(X86-64_SOURCES) $(X86-64_API) +ASM_SOURCES = $(X86-64_SOURCES) +ASM_API = $(X86-64_API) LIB_DIR = $(TOP)/lib64 diff --git a/configs/linux-icc b/configs/linux-icc index 0da3b83..1d51d6e 100644 --- a/configs/linux-icc +++ b/configs/linux-icc @@ -16,6 +16,7 @@ GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -ASM_SOURCES = $(X86_SOURCES) $(X86_API) +ASM_SOURCES = $(X86_SOURCES) +ASM_API = $(X86_API) diff --git a/configs/linux-icc-static b/configs/linux-icc-static index 5c65f05..ac847a9 100644 --- a/configs/linux-icc-static +++ b/configs/linux-icc-static @@ -24,6 +24,7 @@ GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lX APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm MKLIB_OPTIONS = -arch icc -ASM_SOURCES = $(X86_SOURCES) $(X86_API) +ASM_SOURCES = $(X86_SOURCES) +ASM_API = $(X86_API) diff --git a/configs/linux-solo-x86 b/configs/linux-solo-x86 index b4e79ba..13cab37 100644 --- a/configs/linux-solo-x86 +++ b/configs/linux-solo-x86 @@ -10,3 +10,4 @@ PIC_FLAGS = ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM ASM_SOURCES = $(X86_SOURCES) +ASM_API = $(X86_API) diff --git a/configs/linux-x86 b/configs/linux-x86 index b239653..18fa061 100644 --- a/configs/linux-x86 +++ b/configs/linux-x86 @@ -5,4 +5,5 @@ include $(TOP)/configs/linux CONFIG_NAME = linux-x86 ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -ASM_SOURCES = $(X86_SOURCES) $(X86_API) +ASM_SOURCES = $(X86_SOURCES) +ASM_API = $(X86_API) diff --git a/configs/linux-x86-64 b/configs/linux-x86-64 index f8ff548..a89c47e 100644 --- a/configs/linux-x86-64 +++ b/configs/linux-x86-64 @@ -6,7 +6,8 @@ CONFIG_NAME = linux-x86-64 ARCH_FLAGS = -m64 -ASM_SOURCES = $(X86-64_SOURCES) $(X86-64_API) +ASM_SOURCES = $(X86-64_SOURCES) +ASM_API = $(X86-64_API) ASM_FLAGS = -DUSE_X86_64_ASM LIB_DIR = $(TOP)/lib64 diff --git a/configs/linux-x86-glide b/configs/linux-x86-glide index b874b92..1397bdc 100644 --- a/configs/linux-x86-glide +++ b/configs/linux-x86-glide @@ -15,7 +15,8 @@ CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199 GLUT_CFLAGS = -fexceptions -ASM_SOURCES = $(X86_SOURCES) $(X86_API) +ASM_SOURCES = $(X86_SOURCES) +ASM_API = $(X86_API) # Library/program dependencies GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread diff --git a/configs/linux-x86-xcb b/configs/linux-x86-xcb index 7c5074c..a3eeb10 100644 --- a/configs/linux-x86-xcb +++ b/configs/linux-x86-xcb @@ -15,7 +15,8 @@ CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199 GLUT_CFLAGS = -fexceptions -ASM_SOURCES = $(X86_SOURCES) $(X86_API) +ASM_SOURCES = $(X86_SOURCES) +ASM_API = $(X86_API) # Library/program dependencies GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -lXCB diff --git a/configs/sunos5-gcc b/configs/sunos5-gcc index 7917c9b..8d6223c 100644 --- a/configs/sunos5-gcc +++ b/configs/sunos5-gcc @@ -16,7 +16,8 @@ ARCH_FLAGS ?= DEFINES = -D_REENTRANT -DUSE_XSHM -ASM_SOURCES = $(SPARC_SOURCES) $(SPARC_API) +ASM_SOURCES = $(SPARC_SOURCES) +ASM_API = $(SPARC_API) ASM_FLAGS = -DUSE_SPARC_ASM CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \ |