[Gaim-commits] SF.net SVN: gaim: [17748] trunk

[<dat...@us...>]

Revision: 17748
          http://svn.sourceforge.net/gaim/?rev=17748&view=rev
Author:   datallah
Date:     2006-11-14 08:32:40 -0800 (Tue, 14 Nov 2006)

Log Message:
-----------
Update wingaim build and installer for oscar changes.

Modified Paths:
--------------
    trunk/gaim-installer.nsi
    trunk/libgaim/protocols/oscar/Makefile.mingw

Modified: trunk/gaim-installer.nsi
===================================================================
--- trunk/gaim-installer.nsi	2006-11-14 04:04:04 UTC (rev 17747)
+++ trunk/gaim-installer.nsi	2006-11-14 16:32:40 UTC (rev 17748)
@@ -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"

Modified: trunk/libgaim/protocols/oscar/Makefile.mingw
===================================================================
--- trunk/libgaim/protocols/oscar/Makefile.mingw	2006-11-14 04:04:04 UTC (rev 17747)
+++ trunk/libgaim/protocols/oscar/Makefile.mingw	2006-11-14 16:32:40 UTC (rev 17748)
@@ -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)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.