diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-25 08:32:49 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-25 08:32:49 +0100 |
| commit | 0c1cee47049afdcf74d87a23f4f4fd57867f6798 (patch) | |
| tree | 14c117114d1b996e5b04e6546b1580ea53bc26f2 /mesalib/src/mapi/glapi/Makefile | |
| parent | 5be921907008288d6465962063bc10fd7a5b1906 (diff) | |
| parent | e6432710d8a586386b3c7025e845cf4f80830da3 (diff) | |
| download | vcxsrv-0c1cee47049afdcf74d87a23f4f4fd57867f6798.tar.gz vcxsrv-0c1cee47049afdcf74d87a23f4f4fd57867f6798.tar.bz2 vcxsrv-0c1cee47049afdcf74d87a23f4f4fd57867f6798.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mapi/glapi/Makefile')
| -rw-r--r-- | mesalib/src/mapi/glapi/Makefile | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/mesalib/src/mapi/glapi/Makefile b/mesalib/src/mapi/glapi/Makefile index 37b178eee..bb4ed6585 100644 --- a/mesalib/src/mapi/glapi/Makefile +++ b/mesalib/src/mapi/glapi/Makefile @@ -15,6 +15,7 @@ glapi_CPPFLAGS := \ -I$(TOP)/src/mapi \ -I$(TOP)/src/mesa +ifeq ($(SHARED_GLAPI),1) glapi_CPPFLAGS += \ -DMAPI_MODE_BRIDGE \ -DMAPI_ABI_HEADER=\"glapi/glapi_mapi_tmp.h\" @@ -23,6 +24,14 @@ glapi_SOURCES := $(addprefix $(MAPI)/, $(MAPI_BRIDGE_SOURCES)) glapi_GLAPI_OBJECTS := glapi_ASM_OBJECTS := glapi_MAPI_OBJECTS := $(MAPI_BRIDGE_SOURCES:.c=.o) +else +glapi_CPPFLAGS += -DMAPI_MODE_UTIL +glapi_SOURCES := $(GLAPI_SOURCES) $(addprefix $(MAPI)/, $(MAPI_UTIL_SOURCES)) + +glapi_GLAPI_OBJECTS := $(GLAPI_SOURCES:.c=.o) +glapi_ASM_OBJECTS := $(GLAPI_ASM_SOURCES:.S=.o) +glapi_MAPI_OBJECTS := $(MAPI_UTIL_SOURCES:.c=.o) +endif # SHARED_GLAPI glapi_OBJECTS := \ $(glapi_GLAPI_OBJECTS) \ @@ -50,10 +59,14 @@ clean: -rm -f lib$(TARGET).a -rm -f depend depend.bak +ifeq ($(SHARED_GLAPI),1) # workaround a bug in makedepend makedepend_CPPFLAGS := \ $(filter-out -DMAPI_ABI_HEADER=%, $(glapi_CPPFLAGS)) $(glapi_OBJECTS): glapi_mapi_tmp.h +else +makedepend_CPPFLAGS := $(glapi_CPPFLAGS) +endif depend: $(glapi_SOURCES) @ echo "running $(MKDEP)" |