diff options
| author | Chia-I Wu <olv@lunarg.com> | 2010-12-11 03:27:54 +0800 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2010-12-18 15:05:58 +0800 |
| commit | 7048095513f8e91db26736eee0343b1a00d18f6f (patch) | |
| tree | e4be2fcf5a7214d3fd1e47afb078b198bc18d0e3 /src/mapi/glapi | |
| parent | c17d4999f108d86c468cf4b11b08f915c282ce12 (diff) | |
mapi: Clean up sources.mk.
Rename MAPI_GLAPI_SOURCES to MAPI_UTIL_SOURCES. Rename macro
MAPI_GLAPI_CURRENT to MAPI_MODE_UTIL. Update the comments to make it
clear that mapi may be used in two ways and how.
Diffstat (limited to 'src/mapi/glapi')
| -rw-r--r-- | src/mapi/glapi/Makefile | 16 | ||||
| -rw-r--r-- | src/mapi/glapi/SConscript | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/mapi/glapi/Makefile b/src/mapi/glapi/Makefile index acd8429778..a9ab07903c 100644 --- a/src/mapi/glapi/Makefile +++ b/src/mapi/glapi/Makefile @@ -12,10 +12,10 @@ GLAPI_OBJECTS = $(GLAPI_SOURCES:.c=.o) GLAPI_ASM_OBJECTS = $(GLAPI_ASM_SOURCES:.S=.o) include $(MAPI)/sources.mak -MAPI_GLAPI_OBJECTS := $(MAPI_GLAPI_SOURCES:.c=.o) -MAPI_GLAPI_SOURCES := $(addprefix $(MAPI)/, $(MAPI_GLAPI_SOURCES)) +MAPI_UTIL_OBJECTS := $(MAPI_UTIL_SOURCES:.c=.o) +MAPI_UTIL_SOURCES := $(addprefix $(MAPI)/, $(MAPI_UTIL_SOURCES)) -TARGET_OBJECTS = $(GLAPI_OBJECTS) $(GLAPI_ASM_OBJECTS) $(MAPI_GLAPI_OBJECTS) +TARGET_OBJECTS = $(GLAPI_OBJECTS) $(GLAPI_ASM_OBJECTS) $(MAPI_UTIL_OBJECTS) INCLUDE_DIRS = \ -I$(TOP)/include \ @@ -28,13 +28,13 @@ lib$(TARGET).a: $(TARGET_OBJECTS) @$(MKLIB) -o $(TARGET) -static $(TARGET_OBJECTS) $(GLAPI_OBJECTS): %.o: %.c - $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) -DMAPI_GLAPI_CURRENT $< -o $@ + $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) -DMAPI_MODE_UTIL $< -o $@ $(GLAPI_ASM_OBJECTS): %.o: %.S $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@ -$(MAPI_GLAPI_OBJECTS): %.o: $(MAPI)/%.c - $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) -DMAPI_GLAPI_CURRENT $< -o $@ +$(MAPI_UTIL_OBJECTS): %.o: $(MAPI)/%.c + $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) -DMAPI_MODE_UTIL $< -o $@ install: @@ -43,11 +43,11 @@ clean: -rm -f lib$(TARGET).a -rm -f depend depend.bak -depend: $(GLAPI_SOURCES) $(MAPI_GLAPI_SOURCES) +depend: $(GLAPI_SOURCES) $(MAPI_UTIL_SOURCES) @ echo "running $(MKDEP)" @ touch depend @$(MKDEP) $(MKDEP_OPTIONS) -f- $(DEFINES) $(INCLUDE_DIRS) \ - -DMAPI_GLAPI_CURRENT $(GLAPI_SOURCES) $(MAPI_GLAPI_SOURCES) \ + -DMAPI_MODE_UTIL $(GLAPI_SOURCES) $(MAPI_UTIL_SOURCES) \ 2>/dev/null | sed -e 's,^$(MAPI)/,,' > depend -include depend diff --git a/src/mapi/glapi/SConscript b/src/mapi/glapi/SConscript index 27258f808a..4057991ec8 100644 --- a/src/mapi/glapi/SConscript +++ b/src/mapi/glapi/SConscript @@ -9,7 +9,7 @@ if env['platform'] != 'winddk': env = env.Clone() env.Append(CPPDEFINES = [ - 'MAPI_GLAPI_CURRENT', + 'MAPI_MODE_UTIL', ]) if env['platform'] == 'windows': |