Mercurial > pidgin
annotate src/win32/global.mak @ 14089:10e8eb6a4910
[gaim-migrate @ 16712]
Pretty large commit here. Basically I got sick of having to verify
that gc is still valid on all the callback functions for
gaim_proxy_connect(). The fix for this for gaim_proxy_connect() to
return something that allows the connection attempt to be canceled.
It's not quite there yet, but this is a good first step. I changed
gaim_proxy_connect() to return a reference to a new
GaimProxyConnectInfo (this used to be called PHB). Eventually this
can be passed to a function that'll cancel the connection attempt.
I also decided to add an error_cb instead of using connect_cb and
passing a file descriptor of -1. And proxy.c will also pass an
error message to callers which should explain the reason that the
connection attempt failed.
Oh, and proxy.c now never calls gaim_connection_error()
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sat, 12 Aug 2006 10:12:43 +0000 |
parents | 61c6ef28a6fa |
children |
rev | line source |
---|---|
3711
48f3c74c13e0
[gaim-migrate @ 3844]
Herman Bloggs <hermanator12002@yahoo.com>
parents:
diff
changeset
|
1 # |
48f3c74c13e0
[gaim-migrate @ 3844]
Herman Bloggs <hermanator12002@yahoo.com>
parents:
diff
changeset
|
2 # global.mak |
48f3c74c13e0
[gaim-migrate @ 3844]
Herman Bloggs <hermanator12002@yahoo.com>
parents:
diff
changeset
|
3 # |
48f3c74c13e0
[gaim-migrate @ 3844]
Herman Bloggs <hermanator12002@yahoo.com>
parents:
diff
changeset
|
4 # This file should be included by all Makefile.mingw files for project |
48f3c74c13e0
[gaim-migrate @ 3844]
Herman Bloggs <hermanator12002@yahoo.com>
parents:
diff
changeset
|
5 # wide definitions. |
48f3c74c13e0
[gaim-migrate @ 3844]
Herman Bloggs <hermanator12002@yahoo.com>
parents:
diff
changeset
|
6 # |
48f3c74c13e0
[gaim-migrate @ 3844]
Herman Bloggs <hermanator12002@yahoo.com>
parents:
diff
changeset
|
7 |
48f3c74c13e0
[gaim-migrate @ 3844]
Herman Bloggs <hermanator12002@yahoo.com>
parents:
diff
changeset
|
8 CC = gcc.exe |
48f3c74c13e0
[gaim-migrate @ 3844]
Herman Bloggs <hermanator12002@yahoo.com>
parents:
diff
changeset
|
9 |
7242
59ffe137176d
[gaim-migrate @ 7817]
Herman Bloggs <hermanator12002@yahoo.com>
parents:
5932
diff
changeset
|
10 # Use -g flag when building debug version of Gaim (including plugins). |
59ffe137176d
[gaim-migrate @ 7817]
Herman Bloggs <hermanator12002@yahoo.com>
parents:
5932
diff
changeset
|
11 # Use -fnative-struct instead of -mms-bitfields when using mingw 1.1 |
59ffe137176d
[gaim-migrate @ 7817]
Herman Bloggs <hermanator12002@yahoo.com>
parents:
5932
diff
changeset
|
12 # (gcc 2.95) |
11711
61c6ef28a6fa
[gaim-migrate @ 14002]
Daniel Atallah <daniel.atallah@gmail.com>
parents:
11709
diff
changeset
|
13 CFLAGS += -O2 -Wall -pipe -mno-cygwin -mms-bitfields |
3711
48f3c74c13e0
[gaim-migrate @ 3844]
Herman Bloggs <hermanator12002@yahoo.com>
parents:
diff
changeset
|
14 |
5932
bb7723f0b4b9
[gaim-migrate @ 6372]
Herman Bloggs <hermanator12002@yahoo.com>
parents:
4860
diff
changeset
|
15 # If not specified, dlls are built with the default base address of 0x10000000. |
bb7723f0b4b9
[gaim-migrate @ 6372]
Herman Bloggs <hermanator12002@yahoo.com>
parents:
4860
diff
changeset
|
16 # When loaded into a process address space a dll will be rebased if its base |
bb7723f0b4b9
[gaim-migrate @ 6372]
Herman Bloggs <hermanator12002@yahoo.com>
parents:
4860
diff
changeset
|
17 # address colides with the base address of an existing dll. To avoid rebasing |
bb7723f0b4b9
[gaim-migrate @ 6372]
Herman Bloggs <hermanator12002@yahoo.com>
parents:
4860
diff
changeset
|
18 # we do the following. Rebasing can slow down the load time of dlls and it |
bb7723f0b4b9
[gaim-migrate @ 6372]
Herman Bloggs <hermanator12002@yahoo.com>
parents:
4860
diff
changeset
|
19 # also renders debug info useless. |
bb7723f0b4b9
[gaim-migrate @ 6372]
Herman Bloggs <hermanator12002@yahoo.com>
parents:
4860
diff
changeset
|
20 DLL_LD_FLAGS += -Wl,--enable-auto-image-base |
bb7723f0b4b9
[gaim-migrate @ 6372]
Herman Bloggs <hermanator12002@yahoo.com>
parents:
4860
diff
changeset
|
21 |
3711
48f3c74c13e0
[gaim-migrate @ 3844]
Herman Bloggs <hermanator12002@yahoo.com>
parents:
diff
changeset
|
22 VERSION := $(shell cat $(GAIM_TOP)/VERSION) |
48f3c74c13e0
[gaim-migrate @ 3844]
Herman Bloggs <hermanator12002@yahoo.com>
parents:
diff
changeset
|
23 |
4246 | 24 DEFINES += -DVERSION=\"$(VERSION)\" \ |
4860
e1b5619e6a02
[gaim-migrate @ 5187]
Herman Bloggs <hermanator12002@yahoo.com>
parents:
4246
diff
changeset
|
25 -DHAVE_CONFIG_H |