Tue, 14 Feb 2006 05:43:43 +0000
[gaim-migrate @ 15646]
Always show a vertical scrollbar on conversations imhtmls. This will solve the shrinking conversation window bug. I chose this approach instead of saving the size of the window (as I had previous talked about), as this prevents the contents of the scrollback from rewrapping when the scrollbars appear or disappear. It also just seems to feel like the right thing to do, but maybe that's me being lazy.
| 7031 | 1 | # |
| 2 | # Makefile.mingw | |
| 3 | # | |
| 4 | # Description: Makefile for ssl plugin. | |
| 5 | # | |
| 6 | ||
| 7 | # | |
| 8 | # PATHS | |
| 9 | # | |
| 10 | ||
| 11 | GTK_TOP := ../../../win32-dev/gtk_2_0 | |
| 12 | GAIM_TOP := ../.. | |
| 13 | GAIM_INSTALL_DIR := $(GAIM_TOP)/win32-install-dir | |
| 14 | DLL_INSTALL_DIR := $(GAIM_INSTALL_DIR)/plugins | |
|
8066
ff1bab154f3b
[gaim-migrate @ 8764]
Herman Bloggs <herman@bluedigits.com>
parents:
7056
diff
changeset
|
15 | NSS_DIR := ../../../win32-dev/nss-3.9 |
|
ff1bab154f3b
[gaim-migrate @ 8764]
Herman Bloggs <herman@bluedigits.com>
parents:
7056
diff
changeset
|
16 | NSPR_DIR := ../../../win32-dev/nspr-4.4.1 |
| 7031 | 17 | |
| 18 | ## | |
| 19 | ## VARIABLE DEFINITIONS | |
| 20 | ## | |
| 21 | ||
| 22 | TARGET = ssl | |
| 23 | TARGET_NSS = ssl-nss | |
| 24 | ||
|
7056
ce7ac622e415
[gaim-migrate @ 7619]
Herman Bloggs <herman@bluedigits.com>
parents:
7042
diff
changeset
|
25 | NEEDED_DLLS = $(NSS_DIR)/lib/nss3.dll \ |
|
ce7ac622e415
[gaim-migrate @ 7619]
Herman Bloggs <herman@bluedigits.com>
parents:
7042
diff
changeset
|
26 | $(NSS_DIR)/lib/nssckbi.dll \ |
|
ce7ac622e415
[gaim-migrate @ 7619]
Herman Bloggs <herman@bluedigits.com>
parents:
7042
diff
changeset
|
27 | $(NSS_DIR)/lib/softokn3.dll \ |
|
ce7ac622e415
[gaim-migrate @ 7619]
Herman Bloggs <herman@bluedigits.com>
parents:
7042
diff
changeset
|
28 | $(NSS_DIR)/lib/ssl3.dll \ |
|
ce7ac622e415
[gaim-migrate @ 7619]
Herman Bloggs <herman@bluedigits.com>
parents:
7042
diff
changeset
|
29 | $(NSPR_DIR)/lib/nspr4.dll \ |
|
ce7ac622e415
[gaim-migrate @ 7619]
Herman Bloggs <herman@bluedigits.com>
parents:
7042
diff
changeset
|
30 | $(NSPR_DIR)/lib/plc4.dll \ |
|
ce7ac622e415
[gaim-migrate @ 7619]
Herman Bloggs <herman@bluedigits.com>
parents:
7042
diff
changeset
|
31 | $(NSPR_DIR)/lib/plds4.dll |
|
ce7ac622e415
[gaim-migrate @ 7619]
Herman Bloggs <herman@bluedigits.com>
parents:
7042
diff
changeset
|
32 | |
| 7031 | 33 | # Compiler Options |
| 34 | ||
| 35 | CFLAGS = | |
| 36 | ||
| 37 | DEFINES = | |
| 38 | ||
| 39 | ## | |
| 40 | ## INCLUDE MAKEFILES | |
| 41 | ## | |
| 42 | ||
| 43 | include $(GAIM_TOP)/src/win32/global.mak | |
| 44 | ||
| 45 | ## | |
| 46 | ## INCLUDE PATHS | |
| 47 | ## | |
| 48 | ||
| 49 | INCLUDE_PATHS += -I. \ | |
| 50 | -I$(GTK_TOP)/include \ | |
| 51 | -I$(GTK_TOP)/include/gtk-2.0 \ | |
| 52 | -I$(GTK_TOP)/include/glib-2.0 \ | |
| 53 | -I$(GTK_TOP)/include/pango-1.0 \ | |
| 54 | -I$(GTK_TOP)/include/atk-1.0 \ | |
| 55 | -I$(GTK_TOP)/lib/glib-2.0/include \ | |
| 56 | -I$(GTK_TOP)/lib/gtk-2.0/include \ | |
| 57 | -I$(GAIM_TOP)/src \ | |
| 58 | -I$(GAIM_TOP)/src/win32 \ | |
| 59 | -I$(GAIM_TOP) \ | |
| 60 | -I$(NSS_DIR)/include \ | |
| 61 | -I$(NSPR_DIR)/include | |
| 62 | ||
| 63 | LIB_PATHS = -L$(GTK_TOP)/lib \ | |
| 64 | -L$(GAIM_TOP)/src \ | |
| 65 | -L$(NSS_DIR)/lib \ | |
| 66 | -L$(NSPR_DIR)/lib | |
| 67 | ||
| 68 | ## | |
| 69 | ## SOURCES, OBJECTS | |
| 70 | ## | |
| 71 | ||
| 72 | C_SRC = ssl.c | |
| 73 | ||
| 74 | C_SRC_NSS = ssl-nss.c | |
| 75 | ||
| 76 | ||
| 77 | OBJECTS = $(C_SRC:%.c=%.o) | |
| 78 | ||
| 79 | OBJECTS_NSS = $(C_SRC_NSS:%.c=%.o) | |
| 80 | ||
| 81 | ||
| 82 | ## | |
| 83 | ## LIBRARIES | |
| 84 | ## | |
| 85 | ||
| 86 | LIBS = -lgtk-win32-2.0 \ | |
| 87 | -lglib-2.0 \ | |
| 88 | -lgdk-win32-2.0 \ | |
| 89 | -lgmodule-2.0 \ | |
| 90 | -lgobject-2.0 \ | |
| 91 | -lws2_32 \ | |
| 92 | -lintl \ | |
| 93 | -lgaim \ | |
| 94 | -lnss3 \ | |
| 95 | -lnspr4 \ | |
| 96 | -lssl3 | |
| 97 | ||
| 98 | ||
| 99 | ## | |
| 100 | ## RULES | |
| 101 | ## | |
| 102 | ||
| 103 | # How to make a C file | |
| 104 | ||
| 105 | %.o: %.c | |
| 106 | $(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@ -c $< | |
| 107 | ||
| 108 | ## | |
| 109 | ## TARGET DEFINITIONS | |
| 110 | ## | |
| 111 | ||
| 112 | .PHONY: all clean | |
| 113 | ||
|
7042
a1f48a580379
[gaim-migrate @ 7605]
Christian Hammond <chipx86@chipx86.com>
parents:
7031
diff
changeset
|
114 | all: $(TARGET).dll $(TARGET_NSS).dll |
| 7031 | 115 | |
| 116 | install: | |
| 117 | cp $(TARGET).dll $(DLL_INSTALL_DIR) | |
| 118 | cp $(TARGET_NSS).dll $(DLL_INSTALL_DIR) | |
|
7056
ce7ac622e415
[gaim-migrate @ 7619]
Herman Bloggs <herman@bluedigits.com>
parents:
7042
diff
changeset
|
119 | cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR) |
| 7031 | 120 | |
| 121 | ## | |
| 122 | ## BUILD Dependencies | |
| 123 | ## | |
| 124 | ||
| 125 | $(GAIM_TOP)/src/gaim.lib: | |
| 126 | $(MAKE) -C $(GAIM_TOP)/src -f Makefile.mingw gaim.lib | |
| 127 | ||
| 128 | ## | |
| 129 | ## BUILD DLL | |
| 130 | ## | |
| 131 | ||
| 132 | $(TARGET).dll: $(OBJECTS) $(GAIM_TOP)/src/gaim.lib | |
| 133 | $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll | |
|
7056
ce7ac622e415
[gaim-migrate @ 7619]
Herman Bloggs <herman@bluedigits.com>
parents:
7042
diff
changeset
|
134 | |
| 7031 | 135 | $(TARGET_NSS).dll: $(OBJECTS_NSS) $(GAIM_TOP)/src/gaim.lib |
| 136 | $(CC) -shared $(OBJECTS_NSS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET_NSS).dll | |
| 137 | ||
| 138 | ## | |
| 139 | ## CLEAN RULES | |
| 140 | ## | |
| 141 | ||
| 142 | clean: | |
| 143 | rm -rf *.o | |
| 144 | rm -rf $(TARGET).dll | |
| 145 | rm -rf $(TARGET_NSS).dll |