Mercurial > pidgin
changeset 14969:43f692951d49
[gaim-migrate @ 17748]
Update wingaim build and installer for oscar changes.
committer: Tailor Script <tailor@pidgin.im>
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Tue, 14 Nov 2006 16:32:40 +0000 |
| parents | ad564b48dab0 |
| children | 721465a37d4e |
| files | gaim-installer.nsi libgaim/protocols/oscar/Makefile.mingw |
| diffstat | 2 files changed, 27 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/gaim-installer.nsi Tue Nov 14 04:04:04 2006 +0000 +++ b/gaim-installer.nsi Tue Nov 14 16:32:40 2006 +0000 @@ -663,13 +663,14 @@ Delete "$INSTDIR\plugins\history.dll" Delete "$INSTDIR\plugins\iconaway.dll" Delete "$INSTDIR\plugins\idle.dll" + Delete "$INSTDIR\plugins\libaim.dll" Delete "$INSTDIR\plugins\libgg.dll" + Delete "$INSTDIR\plugins\libicq.dll" Delete "$INSTDIR\plugins\libirc.dll" Delete "$INSTDIR\plugins\libjabber.dll" Delete "$INSTDIR\plugins\libmsn.dll" Delete "$INSTDIR\plugins\libnapster.dll" Delete "$INSTDIR\plugins\libnovell.dll" - Delete "$INSTDIR\plugins\liboscar.dll" Delete "$INSTDIR\plugins\libqq.dll" Delete "$INSTDIR\plugins\libsametime.dll" Delete "$INSTDIR\plugins\libsilc.dll" @@ -704,6 +705,7 @@ Delete "$INSTDIR\idletrack.dll" Delete "$INSTDIR\libgaim.dll" Delete "$INSTDIR\libgtkspell.dll" + Delete "$INSTDIR\liboscar.dll" Delete "$INSTDIR\libmeanwhile-1.dll" Delete "$INSTDIR\libxml2.dll" Delete "$INSTDIR\nspr4.dll"
--- a/libgaim/protocols/oscar/Makefile.mingw Tue Nov 14 04:04:04 2006 +0000 +++ b/libgaim/protocols/oscar/Makefile.mingw Tue Nov 14 16:32:40 2006 +0000 @@ -8,6 +8,8 @@ include $(GAIM_TOP)/libgaim/win32/global.mak TARGET = liboscar +AIM_TARGET = libaim +ICQ_TARGET = libicq TYPE = PLUGIN # Static or Plugin... @@ -32,7 +34,8 @@ -I$(GAIM_TOP) LIB_PATHS = -L$(GTK_TOP)/lib \ - -L$(GAIM_LIB_TOP) + -L$(GAIM_LIB_TOP) \ + -L. ## ## SOURCES, OBJECTS @@ -75,6 +78,12 @@ OBJECTS = $(C_SRC:%.c=%.o) +AIM_C_SRC = libaim.c +AIM_OBJECTS = $(AIM_C_SRC:%.c=%.o) + +ICQ_C_SRC = libicq.c +ICQ_OBJECTS = $(ICQ_C_SRC:%.c=%.o) + ## ## LIBRARIES ## @@ -91,21 +100,29 @@ ## .PHONY: all install clean -all: $(TARGET).dll +all: $(TARGET).dll $(AIM_TARGET).dll $(ICQ_TARGET).dll install: all $(DLL_INSTALL_DIR) - cp $(TARGET).dll $(DLL_INSTALL_DIR) + cp $(AIM_TARGET).dll $(ICQ_TARGET).dll $(DLL_INSTALL_DIR) + cp $(TARGET).dll $(GAIM_INSTALL_DIR) $(OBJECTS): $(GAIM_CONFIG_H) -$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS) - $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll +$(TARGET).dll.a $(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS) + $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(TARGET).dll.a -o $(TARGET).dll + +$(AIM_TARGET).dll: $(TARGET).dll.a $(AIM_OBJECTS) + $(CC) -shared $(AIM_OBJECTS) $(LIB_PATHS) $(LIBS) -loscar $(DLL_LD_FLAGS) -o $(AIM_TARGET).dll + +$(ICQ_TARGET).dll: $(TARGET).dll.a $(ICQ_OBJECTS) + $(CC) -shared $(ICQ_OBJECTS) $(LIB_PATHS) $(LIBS) -loscar $(DLL_LD_FLAGS) -o $(ICQ_TARGET).dll ## ## CLEAN RULES ## clean: - rm -f $(OBJECTS) - rm -f $(TARGET).dll + rm -f $(OBJECTS) $(TARGET).dll $(TARGET).dll.a + rm -f $(AIM_OBJECTS) $(AIM_TARGET).dll + rm -f $(ICQ_OBJECTS) $(ICQ_TARGET).dll include $(GAIM_COMMON_TARGETS)