diff options
| -rw-r--r-- | build/build-x64.bat | 2 | ||||
| -rw-r--r-- | build/build-x86.bat | 2 | ||||
| -rw-r--r-- | build/etc/gtk-2.0/gtkrc | 3 | ||||
| -rw-r--r-- | src/makeinc.skel | 16 |
4 files changed, 15 insertions, 8 deletions
diff --git a/build/build-x64.bat b/build/build-x64.bat index 9fdf75de..7fe91b2a 100644 --- a/build/build-x64.bat +++ b/build/build-x64.bat @@ -2,7 +2,7 @@ cd ..\src echo X64 = YES > makeinc.mak type makeinc.skel >> makeinc.mak -set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70;c:\mozilla-build\build\xchat-dev64\include +set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70 set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd64 set OPATH=%PATH% set PATH=c:\WinDDK\7600.16385.1\bin\x86\amd64;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\x64;c:\mozilla-build\build\xchat-dev64\bin diff --git a/build/build-x86.bat b/build/build-x86.bat index 58e9388e..8299aced 100644 --- a/build/build-x86.bat +++ b/build/build-x86.bat @@ -1,7 +1,7 @@ @echo off cd ..\src type makeinc.skel > makeinc.mak -set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70;c:\mozilla-build\build\xchat-dev32\include +set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70 set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386 set OPATH=%PATH% set PATH=c:\WinDDK\7600.16385.1\bin\x86\x86;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;c:\mozilla-build\build\xchat-dev32\bin diff --git a/build/etc/gtk-2.0/gtkrc b/build/etc/gtk-2.0/gtkrc index 6b3ffa45..bd7acd28 100644 --- a/build/etc/gtk-2.0/gtkrc +++ b/build/etc/gtk-2.0/gtkrc @@ -19,6 +19,9 @@ gtk-alternative-sort-arrows = 1 # Windows users don't expect the PC Speaker beeping at them when they backspace in an empty textview and stuff like that gtk-error-bell = 0 +# hide mnemonic underlines until the Alt key is pressed +gtk-auto-mnemonics = 1 + style "msw-default" { GtkWidget::interior-focus = 1 diff --git a/src/makeinc.skel b/src/makeinc.skel index becb9341..bd6fea8d 100644 --- a/src/makeinc.skel +++ b/src/makeinc.skel @@ -9,9 +9,11 @@ LIBS = $(LIBS) gdi32.lib shell32.lib user32.lib advapi32.lib imm32.lib ole32.lib !ifdef X64 ############################################################# #x64 config -GLIB = -Ic:\mozilla-build\build\xchat-dev64\include\glib-2.0 -Ic:\mozilla-build\build\xchat-dev64\lib\glib-2.0\include -GTK = -Ic:\mozilla-build\build\xchat-dev64\include\gtk-2.0 -Ic:\mozilla-build\build\xchat-dev64\lib\gtk-2.0\include -Ic:\mozilla-build\build\xchat-dev64\include\atk-1.0 -Ic:\mozilla-build\build\xchat-dev64\include\cairo -Ic:\mozilla-build\build\xchat-dev64\include\pango-1.0 -Ic:\mozilla-build\build\xchat-dev64\include\glib-2.0 -Ic:\mozilla-build\build\xchat-dev64\lib\glib-2.0\include -Ic:\mozilla-build\build\xchat-dev64\include -LIBS = $(LIBS) /libpath:c:\mozilla-build\build\xchat-dev64\lib gtk-win32-2.0.lib gdk-win32-2.0.lib atk-1.0.lib gio-2.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib intl.lib +DEV64 = c:\mozilla-build\build\xchat-dev64 + +GLIB = -I$(DEV64)\include -I$(DEV64)\include\glib-2.0 -I$(DEV64)\lib\glib-2.0\include +GTK = -I$(DEV64)\include\gtk-2.0 -I$(DEV64)\lib\gtk-2.0\include -I$(DEV64)\include\atk-1.0 -I$(DEV64)\include\cairo -I$(DEV64)\include\pango-1.0 -I$(DEV64)\include\glib-2.0 -I$(DEV64)\lib\glib-2.0\include -I$(DEV64)\include\gdk-pixbuf-2.0 +LIBS = $(LIBS) /libpath:$(DEV64)\lib gtk-win32-2.0.lib gdk-win32-2.0.lib atk-1.0.lib gio-2.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib intl.lib OPENSSLPATH = c:\mozilla-build\build\openssl-wdk-1.0.0a-x64 CFLAGS = $(CFLAGS) /DUSE_OPENSSL /I$(OPENSSLPATH)\include @@ -27,9 +29,11 @@ TCLPATH = c:\mozilla-build\tcl-8.5-x64 !else ############################################################# #x86 config -GLIB = -Ic:\mozilla-build\build\xchat-dev32\include\glib-2.0 -Ic:\mozilla-build\build\xchat-dev32\lib\glib-2.0\include -GTK = -Ic:\mozilla-build\build\xchat-dev32\include\gtk-2.0 -Ic:\mozilla-build\build\xchat-dev32\lib\gtk-2.0\include -Ic:\mozilla-build\build\xchat-dev32\include\atk-1.0 -Ic:\mozilla-build\build\xchat-dev32\include\cairo -Ic:\mozilla-build\build\xchat-dev32\include\pango-1.0 -Ic:\mozilla-build\build\xchat-dev32\include\glib-2.0 -Ic:\mozilla-build\build\xchat-dev32\lib\glib-2.0\include -Ic:\mozilla-build\build\xchat-dev32\include -LIBS = $(LIBS) /libpath:c:\mozilla-build\build\xchat-dev32\lib gtk-win32-2.0.lib gdk-win32-2.0.lib atk-1.0.lib gio-2.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib intl.lib +DEV32 = c:\mozilla-build\build\xchat-dev32 + +GLIB = -I$(DEV32)\include -I$(DEV32)\include\glib-2.0 -I$(DEV32)\lib\glib-2.0\include +GTK = -I$(DEV32)\include\gtk-2.0 -I$(DEV32)\lib\gtk-2.0\include -I$(DEV32)\include\atk-1.0 -I$(DEV32)\include\cairo -I$(DEV32)\include\pango-1.0 -I$(DEV32)\include\glib-2.0 -I$(DEV32)\lib\glib-2.0\include -I$(DEV32)\include\gdk-pixbuf-2.0 +LIBS = $(LIBS) /libpath:$(DEV32)\lib gtk-win32-2.0.lib gdk-win32-2.0.lib atk-1.0.lib gio-2.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib intl.lib OPENSSLPATH = c:\mozilla-build\build\openssl-wdk-1.0.0a-x86 CFLAGS = $(CFLAGS) /DUSE_OPENSSL /I$(OPENSSLPATH)\include |