diff options
| author | berkeviktor@aol.com <berkeviktor@aol.com> | 2010-10-09 12:52:05 +0200 |
|---|---|---|
| committer | berkeviktor@aol.com <berkeviktor@aol.com> | 2010-10-09 12:52:05 +0200 |
| commit | baf032760bee7d397a51ca8f924ca4125d2c9c49 (patch) | |
| tree | e17ab8a9acea7ee54e9fbfc4e47f2951b012b0fe /src | |
| parent | 3c21396a4fcfee1a91c9b61b7030832568c66878 (diff) | |
| parent | 8aec84afd980677284dbb86ed872a2d0d8d9ae59 (diff) | |
Merge
Diffstat (limited to 'src')
| -rw-r--r-- | src/fe-gtk/makefile.mak | 6 | ||||
| -rw-r--r-- | src/fe-gtk/typedef.h | 11 | ||||
| -rw-r--r-- | src/fe-gtk/xchat.rc | 22 | ||||
| -rw-r--r-- | src/makefile.mak | 1 |
4 files changed, 34 insertions, 6 deletions
diff --git a/src/fe-gtk/makefile.mak b/src/fe-gtk/makefile.mak index d83d49d8..883fb5ef 100644 --- a/src/fe-gtk/makefile.mak +++ b/src/fe-gtk/makefile.mak @@ -17,11 +17,8 @@ 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 /r xchat.rc + rc /nologo /r xchat.rc xchat-icon.obj: xchat.res cvtres /nologo $(MACHINE_FLAG) /OUT:xchat-icon.obj xchat.res @@ -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/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 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 <winver.h> +#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 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 |