# HG changeset patch # User Daniel Atallah # Date 1158261964 0 # Node ID 516ef76d643022efd50867f02bcb0dca5cd311f2 # Parent 8ec842950d9239dd84b706b61897012595462bad [gaim-migrate @ 17277] Patch from Joymarquis to make qq compile on win32. committer: Tailor Script diff -r 8ec842950d92 -r 516ef76d6430 libgaim/protocols/qq/Makefile.mingw --- a/libgaim/protocols/qq/Makefile.mingw Thu Sep 14 18:53:56 2006 +0000 +++ b/libgaim/protocols/qq/Makefile.mingw Thu Sep 14 19:26:04 2006 +0000 @@ -1,17 +1,14 @@ # # Makefile.mingw # -# Description: Makefile for win32 (mingw) version of OpenQ src +# Description: Makefile for win32 (mingw) version of the QQ prpl # GAIM_TOP := ../../.. include $(GAIM_TOP)/libgaim/win32/global.mak -TARGET = openq -OPENQ_TOP := .. +TARGET = libqq TYPE = PLUGIN -OPENQ_VERSION := $(shell cat $(OPENQ_TOP)/VERSION) -DEFINES += -DOPENQ_VERSION=\"$(OPENQ_VERSION)\" # Static or Plugin... ifeq ($(TYPE),STATIC) @@ -27,7 +24,6 @@ ## INCLUDE PATHS ## INCLUDE_PATHS += \ - -I$(OPENQ_ROOT) \ -I$(GTK_TOP)/include \ -I$(GTK_TOP)/include/glib-2.0 \ -I$(GTK_TOP)/lib/glib-2.0/include \ @@ -73,7 +69,6 @@ send_core.c \ send_file.c \ sendqueue.c \ - show.c \ sys_msg.c \ udp_proxy_s5.c \ utils.c @@ -110,7 +105,7 @@ ## CLEAN RULES ## clean: - rm -rf $(OBJECTS) - rm -rf $(TARGET).dll + rm -f $(OBJECTS) + rm -f $(TARGET).dll include $(GAIM_COMMON_TARGETS) diff -r 8ec842950d92 -r 516ef76d6430 libgaim/protocols/qq/crypt.c --- a/libgaim/protocols/qq/crypt.c Thu Sep 14 18:53:56 2006 +0000 +++ b/libgaim/protocols/qq/crypt.c Thu Sep 14 19:26:04 2006 +0000 @@ -38,7 +38,11 @@ 0x61C88647 is what we can track on the ASM codes.!! */ +#ifdef _WIN32 +#include "win32dep.h" +#else #include +#endif #include