From 11a9adb19fbfbf265f37edba893a810ea50959a1 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Wed, 6 Oct 2010 14:29:45 +0200 Subject: be consistent about ssize_t --- src/fe-gtk/typedef.h | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/fe-gtk/typedef.h (limited to 'src') diff --git a/src/fe-gtk/typedef.h b/src/fe-gtk/typedef.h new file mode 100644 index 00000000..b20612ea --- /dev/null +++ b/src/fe-gtk/typedef.h @@ -0,0 +1,11 @@ +#ifndef SSIZE_T_DEFINED +#ifdef ssize_t +#undef ssize_t +#endif +#ifdef _WIN64 +typedef __int64 ssize_t; +#else +typedef _W64 int ssize_t; +#endif +#define SSIZE_T_DEFINED +#endif -- cgit 1.4.1 From d68e312723e4fcdd0a088955f5f4dbbd1d5f2ff8 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Fri, 8 Oct 2010 02:47:13 +0200 Subject: build xchat-wdk with vc10 as well --- build/build-x64.bat | 2 +- build/build-x86.bat | 2 +- src/fe-gtk/makefile.mak | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/build/build-x64.bat b/build/build-x64.bat index 7fe91b2a..a6c10002 100644 --- a/build/build-x64.bat +++ b/build/build-x64.bat @@ -5,7 +5,7 @@ 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 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 +set PATH=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 cd common nmake /nologo /f makefile.mak clean cd ..\fe-gtk diff --git a/build/build-x86.bat b/build/build-x86.bat index 8299aced..3dbd169e 100644 --- a/build/build-x86.bat +++ b/build/build-x86.bat @@ -4,7 +4,7 @@ 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 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 +set PATH=c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin;c:\mozilla-build\build\xchat-dev32\bin nmake /nologo /f makefile.mak clean cd pixmaps nmake /nologo /f makefile.mak diff --git a/src/fe-gtk/makefile.mak b/src/fe-gtk/makefile.mak index d83d49d8..02bd8479 100644 --- a/src/fe-gtk/makefile.mak +++ b/src/fe-gtk/makefile.mak @@ -21,7 +21,7 @@ xchat.rc: echo XC_ICON ICON "../../xchat.ico" > xchat.rc xchat.res: xchat.rc ../../xchat.ico - rc /r xchat.rc + rc /nologo /r xchat.rc xchat-icon.obj: xchat.res cvtres /nologo $(MACHINE_FLAG) /OUT:xchat-icon.obj xchat.res -- cgit 1.4.1 From 37fd78926f6e6a090d4fef82175da6a8942040c9 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Sat, 9 Oct 2010 09:03:15 +0200 Subject: resource file for executable --- src/fe-gtk/makefile.mak | 4 ---- src/fe-gtk/xchat.rc | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 src/fe-gtk/xchat.rc (limited to 'src') diff --git a/src/fe-gtk/makefile.mak b/src/fe-gtk/makefile.mak index 02bd8479..883fb5ef 100644 --- a/src/fe-gtk/makefile.mak +++ b/src/fe-gtk/makefile.mak @@ -17,9 +17,6 @@ all: $(PROG) $(PROG): $(FEGTK_OBJECTS) $(COMLIB) xchat-icon.obj $(LINK) /out:$(PROG) /entry:mainCRTStartup $(LDFLAGS) $(LIBS) $(FEGTK_OBJECTS) $(COMLIB) xchat-icon.obj -xchat.rc: - echo XC_ICON ICON "../../xchat.ico" > xchat.rc - xchat.res: xchat.rc ../../xchat.ico rc /nologo /r xchat.rc @@ -29,5 +26,4 @@ xchat-icon.obj: xchat.res clean: @del *.obj @del $(PROG) - @del xchat.rc @del xchat.res diff --git a/src/fe-gtk/xchat.rc b/src/fe-gtk/xchat.rc new file mode 100644 index 00000000..18c209c1 --- /dev/null +++ b/src/fe-gtk/xchat.rc @@ -0,0 +1,22 @@ +#include +#include "../../config.h" + +XC_ICON ICON "../../xchat.ico" + +VS_VERSION_INFO VERSIONINFO + BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + + VALUE "FileDescription", "XChat-WDK IRC Client" + VALUE "ProductName", "XChat-WDK" + VALUE "ProductVersion", PACKAGE_VERSION + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0409, 0x04B0 + END + END -- cgit 1.4.1 From 8b6c28eee2f472ed3c07a8ad5d371b32012088cd Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Sat, 9 Oct 2010 09:08:19 +0200 Subject: don't delete the resource file --- src/makefile.mak | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/makefile.mak b/src/makefile.mak index 2826de8c..68b2f19d 100644 --- a/src/makefile.mak +++ b/src/makefile.mak @@ -11,7 +11,6 @@ clean: @del common\xchatcommon.lib @del fe-gtk\*.obj @del fe-gtk\xchat.exe - @del fe-gtk\xchat.rc @del fe-gtk\xchat.res # @del fe-text\*.obj # @del fe-text\xchat-text.exe -- cgit 1.4.1