Mercurial > pidgin.yaz
changeset 3715:764d6f1848b2
[gaim-migrate @ 3848]
Introduction of global.mak
committer: Tailor Script <tailor@pidgin.im>
| author | Herman Bloggs <hermanator12002@yahoo.com> |
|---|---|
| date | Wed, 16 Oct 2002 19:40:00 +0000 |
| parents | 380b043a4a1c |
| children | d7e83b4db191 |
| files | plugins/Makefile.mingw plugins/ticker/Makefile.mingw src/Makefile.mingw |
| diffstat | 3 files changed, 18 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/Makefile.mingw Wed Oct 16 19:39:27 2002 +0000 +++ b/plugins/Makefile.mingw Wed Oct 16 19:40:00 2002 +0000 @@ -19,15 +19,11 @@ ## VARIABLE DEFINITIONS ## -VERSION := $(shell cat $(GAIM_TOP)/VERSION) - # Compiler Options -CC = gcc.exe +CFLAGS = -CFLAGS = -O2 -Wall -Werror -mno-cygwin -fnative-struct - -DEFINES = -DGTK_ENABLE_BROKEN -DVERSION=\"$(VERSION)\" +DEFINES = .SUFFIXES: .SUFFIXES: .c .dll @@ -36,6 +32,7 @@ ## INCLUDE MAKEFILES ## +include $(GAIM_TOP)/src/win32/global.mak ## ## INCLUDE PATHS @@ -88,9 +85,9 @@ .c.dll: $(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o tmp$@.o -c $< dlltool -D $@ -z $@.def tmp$@.o - gcc -mdll -o junk.tmp -Wl,--base-file,$@.base tmp$@.o $(LIB_PATHS) $(LIBS) + $(CC) -mdll -o junk.tmp -Wl,--base-file,$@.base tmp$@.o $(LIB_PATHS) $(LIBS) dlltool -D $@ -b $@.base -e $@.exp -d $@.def - gcc -mdll -o $@ tmp$@.o -Wl,$@.exp $(LIB_PATHS) $(LIBS) + $(CC) -mdll -o $@ tmp$@.o -Wl,$@.exp $(LIB_PATHS) $(LIBS) rm -rf $@.base $@.def $@.exp junk.tmp plugins: autorecon.dll iconaway.dll spellchk.dll
--- a/plugins/ticker/Makefile.mingw Wed Oct 16 19:39:27 2002 +0000 +++ b/plugins/ticker/Makefile.mingw Wed Oct 16 19:40:00 2002 +0000 @@ -22,21 +22,18 @@ TARGET = ticker -VERSION := $(shell cat $(GAIM_TOP)/VERSION) - # Compiler Options -CC = gcc.exe +CFLAGS = -CFLAGS = -O2 -Werror -Wall -mno-cygwin -fnative-struct - -DEFINES = -DGTK_ENABLE_BROKEN -DVERSION=\"$(VERSION)\" +DEFINES = ## ## INCLUDE MAKEFILES ## +include $(GAIM_TOP)/src/win32/global.mak ## ## INCLUDE PATHS @@ -114,7 +111,7 @@ $(OBJECTS) $(TARGET).base: $(OBJECTS) $(GAIM_TOP)/src/gaim.lib - gcc -mdll -o junk.tmp -Wl,--base-file,$@ $(OBJECTS) $(LIB_PATHS) $(LIBS) + $(CC) -mdll -o junk.tmp -Wl,--base-file,$@ $(OBJECTS) $(LIB_PATHS) $(LIBS) rm -rf junk.tmp $(TARGET).exp: $(TARGET).def $(TARGET).base @@ -123,7 +120,7 @@ rm -rf $(TARGET).base $(TARGET).dll: $(OBJECTS) $(TARGET).exp $(GAIM_TOP)/src/gaim.lib - gcc -mdll -o $(TARGET).dll $(OBJECTS) -Wl,$(TARGET).exp $(LIB_PATHS) $(LIBS) + $(CC) -mdll -o $(TARGET).dll $(OBJECTS) -Wl,$(TARGET).exp $(LIB_PATHS) $(LIBS) rm -rf $(TARGET).exp
--- a/src/Makefile.mingw Wed Oct 16 19:39:27 2002 +0000 +++ b/src/Makefile.mingw Wed Oct 16 19:40:00 2002 +0000 @@ -8,8 +8,6 @@ # PATHS # -BUILD_TOOLS = /usr/local/mingw - INCLUDE_DIR := . GTK_TOP := ../../win32-dev/gtk_2_0 GAIM_TOP := .. @@ -24,17 +22,11 @@ TARGET = gaim -VERSION := $(shell cat $(GAIM_TOP)/VERSION) - # Compiler and Linker Options -GCOPTS = -B $(BUILD_TOOLS) - -CC = gcc.exe $(GCOPTS) +CFLAGS = -CFLAGS = -g -mno-cygwin -fnative-struct - -DEFINES = -DHAVE_CONFIG_H -DVERSION=\"$(VERSION)\" -DGTK_ENABLE_BROKEN +DEFINES = LDFLAGS = -mwindows @@ -45,6 +37,7 @@ ## INCLUDE MAKEFILES ## +include $(GAIM_TOP)/src/win32/global.mak ## ## INCLUDE PATHS @@ -107,7 +100,8 @@ sound.c \ util.c \ win32/win32dep.c \ - win32/MinimizeToTray.c + win32/MinimizeToTray.c \ + win32/libc_interface.c RC_SRC = win32/gaimrc.rc @@ -174,7 +168,7 @@ --exclude-symbols WinMain@16 $^ $(TARGET).base: $(HEADER_DEPS) $(DLL_OBJECTS) - gcc -mdll $(LDFLAGS) -o junk.tmp -Wl,--base-file,$@ $(DLL_OBJECTS) $(LIB_PATHS) $(DLL_LIBS) + $(CC) -mdll $(LDFLAGS) -o junk.tmp -Wl,--base-file,$@ $(DLL_OBJECTS) $(LIB_PATHS) $(DLL_LIBS) rm -rf junk.tmp $(TARGET).exp: $(TARGET).base $(TARGET).def @@ -182,7 +176,7 @@ --output-exp $(TARGET).exp --def $(TARGET).def $(TARGET).dll: $(HEADER_DEPS) $(DLL_OBJECTS) $(TARGET).exp - gcc -mdll $(LDFLAGS) -o $(TARGET).dll $(DLL_OBJECTS) -Wl,$(TARGET).exp $(LIB_PATHS) $(DLL_LIBS) + $(CC) -mdll $(LDFLAGS) -o $(TARGET).dll $(DLL_OBJECTS) -Wl,$(TARGET).exp $(LIB_PATHS) $(DLL_LIBS) rm -rf $(TARGET).exp $(TARGET).def $(TARGET).base $(TARGET).lib: $(TARGET).def @@ -193,9 +187,7 @@ # $(TARGET).exe: $(TARGET).lib $(EXE_OBJECTS) - gcc $(LDFLAGS) $(EXE_OBJECTS) $(LIB_PATHS) $(EXE_LIBS) -o $(TARGET).exe - -# -Wl,--subsystem,windows + $(CC) $(LDFLAGS) $(EXE_OBJECTS) $(LIB_PATHS) $(EXE_LIBS) -o $(TARGET).exe ## ## CLEAN RULES