From: Herman B. <her...@us...> - 2002-10-16 19:54:32
|
Update of /cvsroot/gaim/gaim/src/protocols/napster In directory usw-pr-cvs1:/tmp/cvs-serv5714 Modified Files: Makefile.mingw Log Message: global.mak introduced Index: Makefile.mingw =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/napster/Makefile.mingw,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile.mingw 11 Oct 2002 03:14:00 -0000 1.1 +++ Makefile.mingw 16 Oct 2002 19:54:29 -0000 1.2 @@ -20,18 +20,11 @@ TARGET = libnapster -VERSION := $(shell cat $(GAIM_TOP)/VERSION) - # Compiler Options -CC = gcc - -CFLAGS = -O2 -Werror -Wall -mno-cygwin -fnative-struct +CFLAGS = -DEFINES = -DAIM_BUILDDATE=\"`date +%Y%m%d`\" \ - -DAIM_BUILDTIME=\"`date +%H%M%S`\" \ - -DVERSION=\"$(VERSION)\" \ - -DHAVE_CONFIG_H +DEFINES = # Static or Plugin... ifeq ($(TYPE),STATIC) @@ -48,6 +41,7 @@ ## INCLUDE MAKEFILES ## +include $(GAIM_TOP)/src/win32/global.mak ## ## INCLUDE PATHS @@ -126,7 +120,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 @@ -136,7 +130,7 @@ $(TARGET).dll: $(OBJECTS) $(TARGET).exp $(GAIM_TOP)/src/gaim.lib dlltool -D $(TARGET).dll -d $(TARGET).def -l $(TARGET).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 |