From 9c8f37cc15393e918f19a6e6e34ae52d4272383b Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Mon, 10 Jan 2011 08:48:50 +0100 Subject: add support for xchat-text --- build/build-x64.bat | 2 ++ build/release-x64.bat | 1 + build/release-x86.bat | 1 + build/xchat-wdk.skel.iss | 7 +++++++ src/makefile.mak | 8 ++++---- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/build/build-x64.bat b/build/build-x64.bat index a4148768..6f49dae2 100644 --- a/build/build-x64.bat +++ b/build/build-x64.bat @@ -15,6 +15,8 @@ cd common nmake /nologo /f makefile.mak clean cd ..\fe-gtk nmake /nologo /f makefile.mak clean +cd ..\fe-text +nmake /nologo /f makefile.mak clean cd .. nmake /nologo /f makefile.mak cd ..\plugins diff --git a/build/release-x64.bat b/build/release-x64.bat index f825ca99..6bc3e137 100644 --- a/build/release-x64.bat +++ b/build/release-x64.bat @@ -2,6 +2,7 @@ set DEPS_ROOT=..\dep-x64 set XCHAT_DEST=..\tmp copy ..\src\fe-gtk\xchat.exe %XCHAT_DEST%\xchat.exe.x64 +copy ..\src\fe-text\xchat-text.exe %XCHAT_DEST%\xchat-text.exe.x64 copy %DEPS_ROOT%\bin\libgtk-win32-2.0-0.dll %XCHAT_DEST%\libgtk-win32-2.0-0.dll.x64 copy %DEPS_ROOT%\bin\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST%\libgdk_pixbuf-2.0-0.dll.x64 copy %DEPS_ROOT%\bin\libgio-2.0-0.dll %XCHAT_DEST%\libgio-2.0-0.dll.x64 diff --git a/build/release-x86.bat b/build/release-x86.bat index cff0b465..8eb1b019 100644 --- a/build/release-x86.bat +++ b/build/release-x86.bat @@ -6,6 +6,7 @@ mkdir %XCHAT_DEST% echo 2> portable-mode move portable-mode %XCHAT_DEST% copy ..\src\fe-gtk\xchat.exe %XCHAT_DEST% +copy ..\src\fe-text\xchat-text.exe %XCHAT_DEST% copy %DEPS_ROOT%\bin\libgtk-win32-2.0-0.dll %XCHAT_DEST% copy %DEPS_ROOT%\bin\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST% copy %DEPS_ROOT%\bin\libgio-2.0-0.dll %XCHAT_DEST% diff --git a/build/xchat-wdk.skel.iss b/build/xchat-wdk.skel.iss index 83df9061..d543003f 100644 --- a/build/xchat-wdk.skel.iss +++ b/build/xchat-wdk.skel.iss @@ -33,6 +33,7 @@ Name: "custom"; Description: "Custom Installation"; Flags: iscustom [Components] Name: "libs"; Description: "XChat-WDK"; Types: normal full minimal custom; Flags: fixed +Name: "xctext"; Description: "XChat-Text"; Types: full custom; Flags: disablenouninstallwarning Name: "translations"; Description: "Translations"; Types: normal full custom; Flags: disablenouninstallwarning Name: "spelling"; Description: "Spelling Dictionaries"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins"; Description: "Plugins"; Types: full custom; Flags: disablenouninstallwarning @@ -183,6 +184,11 @@ Source: "lib\gtk-2.0\modules\libgail.dll.x64"; DestDir: "{app}\lib\gtk-2.0\modul +Source: "xchat-text.exe"; DestDir: "{app}"; Components: xctext; Tasks: x86 +Source: "xchat-text.exe.x64"; DestDir: "{app}"; DestName: "xchat-text.exe"; Components: xctext; Tasks: x64 + + + ;Source: "plugins\xcewc.dll"; DestDir: "{app}\plugins"; Components: plugins\ewc; Tasks: x86 ;Source: "plugins\xcewc.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcewc.dll"; Components: plugins\ewc; Tasks: x64 @@ -226,6 +232,7 @@ Source: "plugins\xcperl-512.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcper [Icons] Name: "{group}\XChat-WDK"; Filename: "{app}\xchat.exe"; Tasks: not portable +Name: "{group}\XChat-Text"; Filename: "{app}\xchat-text.exe"; Tasks: not portable Name: "{group}\Uninstall XChat-WDK"; Filename: "{uninstallexe}"; Tasks: not portable [Messages] diff --git a/src/makefile.mak b/src/makefile.mak index 68b2f19d..670774ed 100644 --- a/src/makefile.mak +++ b/src/makefile.mak @@ -3,8 +3,8 @@ all: @-$(MAKE) /nologo /s /f makefile.mak $@ @cd ..\fe-gtk @-$(MAKE) /nologo /s /f makefile.mak $@ -# @cd ..\fe-text -# @-$(MAKE) /nologo /s /f makefile.mak $@ + @cd ..\fe-text + @-$(MAKE) /nologo /s /f makefile.mak $@ clean: @del common\*.obj @@ -12,6 +12,6 @@ clean: @del fe-gtk\*.obj @del fe-gtk\xchat.exe @del fe-gtk\xchat.res -# @del fe-text\*.obj -# @del fe-text\xchat-text.exe + @del fe-text\*.obj + @del fe-text\xchat-text.exe @del pixmaps\*.h -- cgit 1.4.1