soc.2009.vulture: 768b5d57: Initial commit. Integrated Vulture with ...
gdick at soc.pidgin.im
gdick at soc.pidgin.im
Mon May 25 07:21:25 EDT 2009
-----------------------------------------------------------------
Revision: 768b5d57a18b75ea6a8f9193c297e2305c3576c1
Ancestor: 0efb1ca4e26817b43b720e46e93e8a9c627b729b
Author: gdick at soc.pidgin.im
Date: 2009-05-23T12:32:11
Branch: im.pidgin.soc.2009.vulture
URL: http://d.pidgin.im/viewmtn/revision/info/768b5d57a18b75ea6a8f9193c297e2305c3576c1
Added files:
vulture/Makefile.mingw vulture/vulture.c
Added directories:
vulture
Modified files:
Makefile.mingw libpurple/win32/global.mak
ChangeLog:
Initial commit. Integrated Vulture with build system.
-------------- next part --------------
============================================================
--- vulture/Makefile.mingw 05721191bb83f11c7f64405fd6933733339067bd
+++ vulture/Makefile.mingw 05721191bb83f11c7f64405fd6933733339067bd
@@ -0,0 +1,102 @@
+#
+# Makefile.mingw
+#
+# Description: MinGW Makefile for Vulture. Adapted from Pidgin's
+# Makefile.
+#
+
+PIDGIN_TREE_TOP := ..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+NEEDED_DLLS = $(GTKSPELL_TOP)/gtkspell/libgtkspell.dll
+
+##
+## VARIABLE DEFINITIONS
+##
+VULTURE_TARGET := vulture
+EXE_NAME := $(EXE_TARGET).exe
+
+WINAPP := -mwindows
+
+LDFLAGS := $(WINAPP)
+
+DEFINES += -DUNICODE \
+ -D_UNICODE \
+ -D_WIN32_WINNT=0x0400 \
+ -D_WIN32_WINDOWS=0x0400 \
+ -DWINVER=0x0400 \
+ -D_WIN32_IE=0x0500
+
+##
+## INCLUDE PATHS
+##
+PURPLE_INCLUDE_PATHS = \
+ -I$(PURPLE_TOP) \
+ -I$(PURPLE_TOP)/win32 \
+ -I$(PIDGIN_TREE_TOP) \
+ -I$(GTK_TOP)/include \
+ -I$(GTK_TOP)/include/glib-2.0 \
+ -I$(GTK_TOP)/lib/glib-2.0/include
+
+INCLUDE_PATHS += \
+ $(PURPLE_INCLUDE_PATHS) \
+ -I$(PIDGIN_TOP) \
+ -I$(PIDGIN_TOP)/win32
+
+LIB_PATHS += -L$(GTK_TOP)/lib \
+ -L$(PURPLE_TOP) \
+ -L$(PIDGIN_TOP)
+
+##
+## SOURCES, OBJECTS
+##
+VULTURE_C_SRC = \
+ vulture.c
+
+# VULTURE_RC_SRC = win32/pidgin_dll_rc.rc
+VULTURE_OBJECTS = $(VULTURE_C_SRC:%.c=%.o) $(VULTURE_RC_SRC:%.rc=%.o)
+
+##
+## LIBRARIES
+##
+
+PIDGIN_LIBS = \
+ -lglib-2.0 \
+ -lpurple \
+ -lwinmm
+
+# -lintl \
+# -lgobject-2.0 \
+# -lgthread-2.0 \
+
+include $(PIDGIN_COMMON_RULES)
+
+##
+## TARGET DEFINITIONS
+##
+.PHONY: all install install_shallow clean
+
+all: $(VULTURE_TARGET).exe
+
+install_shallow: $(VULTURE_INSTALL_DIR) $(VULTURE_TARGET).exe
+ cp $(VULTURE_TARGET).exe $(VULTURE_INSTALL_DIR)
+ cp $(NEEDED_DLLS) $(VULTURE_INSTALL_DIR)
+
+install: install_shallow all
+
+vulture.rc: vulture.rc.in $(PIDGIN_TREE_TOP)/VERSION
+ sed -e 's/@PIDGIN_VERSION@/$(PIDGIN_VERSION)/g' \
+ -e 's/@ORIGINAL_FILENAME@/$(EXE_NAME)/' \
+ $@.in > $@
+
+$(VULTURE_TARGET).exe: $(PURPLE_DLL).a $(VULTURE_OBJECTS)
+ $(CC) $(LDFLAGS) $(VULTURE_OBJECTS) $(LIB_PATHS) $(VULTURE_LIBS) -o $(VULTURE_TARGET).exe
+
+##
+## CLEAN RULES
+##
+clean:
+ rm -f $(VULTURE_OBJECTS) $(VULTURE_RC_SRC)
+ rm -f $(VULTURE_TARGET).exe
+
+include $(PIDGIN_COMMON_TARGETS)
============================================================
--- vulture/vulture.c 0742db3f7d10914c283478527d69d2f28d1d91eb
+++ vulture/vulture.c 0742db3f7d10914c283478527d69d2f28d1d91eb
@@ -0,0 +1,28 @@
+/*
+ * Vulture - Win32 libpurple client
+ *
+ * Copyright (C) 2009, Gregor Dick <gdick at soc.pidgin.im>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+ */
+
+
+#include <windows.h>
+
+
+int WINAPI WinMain(HINSTANCE hinst, HINSTANCE hinstPrev, LPSTR szCmdLine, int iCmdShow)
+{
+ return 0;
+}
============================================================
--- Makefile.mingw 41e8468122706bf36226479bc2852a4d2fb193ad
+++ Makefile.mingw cb550b33a8f2f05d0b9b881d4e7a169ee25cdafb
@@ -76,6 +76,7 @@ all: $(PIDGIN_CONFIG_H)
all: $(PIDGIN_CONFIG_H)
$(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE)
$(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE)
+ $(MAKE) -C $(VULTURE_TOP) -f $(MINGW_MAKEFILE)
ifndef DISABLE_NLS
$(MAKE) -C $(PURPLE_PO_TOP) -f $(MINGW_MAKEFILE)
endif
@@ -83,6 +84,7 @@ install: all $(PIDGIN_INSTALL_DIR)
install: all $(PIDGIN_INSTALL_DIR)
$(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) install
$(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) install
+ $(MAKE) -C $(VULTURE_TOP) -f $(MINGW_MAKEFILE) install
ifndef DISABLE_NLS
$(MAKE) -C $(PURPLE_PO_TOP) -f $(MINGW_MAKEFILE) install
endif
@@ -122,6 +124,7 @@ clean:
clean:
$(MAKE) -C $(PURPLE_PO_TOP) -f $(MINGW_MAKEFILE) clean
+ $(MAKE) -C $(VULTURE_TOP) -f $(MINGW_MAKEFILE) clean
$(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) clean
$(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) clean
$(MAKE) -C share/ca-certs -f $(MINGW_MAKEFILE) clean
============================================================
--- libpurple/win32/global.mak e1a9517bb6cc3e0a8389237c754fb57fafc0de86
+++ libpurple/win32/global.mak fd9308a4c94e83af9e11b6aaf6d8a578c005e96c
@@ -26,6 +26,7 @@ PIDGIN_INSTALL_DIR := $(PIDGIN_TREE_TOP)
# Where we installing this stuff to?
PIDGIN_INSTALL_DIR := $(PIDGIN_TREE_TOP)/win32-install-dir
+VULTURE_INSTALL_DIR := $(PIDGIN_TREE_TOP)/win32-install-dir
PURPLE_INSTALL_DIR := $(PIDGIN_TREE_TOP)/win32-install-dir
PIDGIN_INSTALL_PERLMOD_DIR := $(PIDGIN_INSTALL_DIR)/perlmod
PIDGIN_INSTALL_PLUGINS_DIR := $(PIDGIN_INSTALL_DIR)/plugins
@@ -41,6 +42,7 @@ PIDGIN_PLUGINS_TOP := $(PIDGIN_TOP)/plug
PIDGIN_IDLETRACK_TOP := $(PIDGIN_TOP)/win32/IdleTracker
PIDGIN_PIXMAPS_TOP := $(PIDGIN_TOP)/pixmaps
PIDGIN_PLUGINS_TOP := $(PIDGIN_TOP)/plugins
+VULTURE_TOP := $(PIDGIN_TREE_TOP)/vulture
PURPLE_PO_TOP := $(PIDGIN_TREE_TOP)/po
PURPLE_PROTOS_TOP := $(PURPLE_TOP)/protocols
@@ -55,6 +57,7 @@ PIDGIN_PORTABLE_EXE := $(PIDGIN_TOP)/pid
PIDGIN_DLL := $(PIDGIN_TOP)/pidgin.dll
PIDGIN_EXE := $(PIDGIN_TOP)/pidgin.exe
PIDGIN_PORTABLE_EXE := $(PIDGIN_TOP)/pidgin-portable.exe
+VULTURE_EXE := $(VULTURE_TOP)/vulture.exe
GCCWARNINGS ?= -Waggregate-return -Wcast-align -Wdeclaration-after-statement -Werror-implicit-function-declaration -Wextra -Wno-sign-compare -Wno-unused-parameter -Winit-self -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wundef
More information about the Commits
mailing list