SoniEx2
/
c.sexchat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

re-enable xtray

This commit is contained in:
berkeviktor@aol.com 2011-01-14 05:35:09 +01:00
parent 0c87e4b914
commit 1effb26d5f
4 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/release-x64.bat
View File

@ -39,6 +39,6 @@ copy ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins\xcpython.dll.x64
copy ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins\xctcl.dll.x64 copy ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins\xctcl.dll.x64
copy ..\plugins\upd\xcupd.dll %XCHAT_DEST%\plugins\xcupd.dll.x64 copy ..\plugins\upd\xcupd.dll %XCHAT_DEST%\plugins\xcupd.dll.x64
::copy ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins\xcxdcc.dll.x64 ::copy ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins\xcxdcc.dll.x64
::copy ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins\xtray.dll.x64 copy ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins\xtray.dll.x64
copy ..\plugins\winamp\xcwinamp.dll %XCHAT_DEST%\plugins\xcwinamp.dll.x64 copy ..\plugins\winamp\xcwinamp.dll %XCHAT_DEST%\plugins\xcwinamp.dll.x64
copy %DEPS_ROOT%\bin\lua51.dll %XCHAT_DEST%\lua51.dll.x64 copy %DEPS_ROOT%\bin\lua51.dll %XCHAT_DEST%\lua51.dll.x64

2
build/release-x86.bat
View File

@ -51,7 +51,7 @@ copy ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins
copy ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins copy ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins
copy ..\plugins\upd\xcupd.dll %XCHAT_DEST%\plugins copy ..\plugins\upd\xcupd.dll %XCHAT_DEST%\plugins
::copy ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins ::copy ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins
::copy ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins copy ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins
copy ..\plugins\winamp\xcwinamp.dll %XCHAT_DEST%\plugins copy ..\plugins\winamp\xcwinamp.dll %XCHAT_DEST%\plugins
copy %DEPS_ROOT%\bin\lua51.dll %XCHAT_DEST% copy %DEPS_ROOT%\bin\lua51.dll %XCHAT_DEST%
xcopy /q /s /i ..\po\locale %XCHAT_DEST%\locale xcopy /q /s /i ..\po\locale %XCHAT_DEST%\locale

10
build/xchat-wdk.skel.iss
View File

@ -53,8 +53,8 @@ Name: "langs\tcl"; Description: "Tcl"; Types: full custom; Flags: disablenounins
Name: x86; Description: "x86"; GroupDescription: "XChat-WDK version:"; Flags: exclusive unchecked Name: x86; Description: "x86"; GroupDescription: "XChat-WDK version:"; Flags: exclusive unchecked
Name: x64; Description: "x64"; GroupDescription: "XChat-WDK version:"; Flags: exclusive; Check: Is64BitInstallMode Name: x64; Description: "x64"; GroupDescription: "XChat-WDK version:"; Flags: exclusive; Check: Is64BitInstallMode
;Name: xtray; Description: "X-Tray"; GroupDescription: "Tray Icon"; Flags: exclusive Name: noxtray; Description: "Plugin-Tray"; GroupDescription: "Tray Icon"; Flags: exclusive
;Name: noxtray; Description: "Plugin-Tray"; GroupDescription: "Tray Icon"; Flags: exclusive unchecked Name: xtray; Description: "X-Tray"; GroupDescription: "Tray Icon"; Flags: exclusive unchecked
Name: perl510; Description: "5.10"; GroupDescription: "Perl version:"; Flags: exclusive unchecked; Components: langs\perl Name: perl510; Description: "5.10"; GroupDescription: "Perl version:"; Flags: exclusive unchecked; Components: langs\perl
Name: perl512; Description: "5.12"; GroupDescription: "Perl version:"; Flags: exclusive; Components: langs\perl Name: perl512; Description: "5.12"; GroupDescription: "Perl version:"; Flags: exclusive; Components: langs\perl
@ -225,10 +225,8 @@ Source: "plugins\xcperl-512.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcper
;Source: "plugins\xtray.dll"; DestDir: "{app}\plugins"; Components: libs; Tasks: x86 Source: "plugins\xtray.dll"; DestDir: "{app}\plugins"; Components: libs; Tasks: x86 and xtray
; and xtray Source: "plugins\xtray.dll.x64"; DestDir: "{app}\plugins"; DestName: "xtray.dll"; Components: libs; Tasks: x64 and xtray
;Source: "plugins\xtray.dll.x64"; DestDir: "{app}\plugins"; DestName: "xtray.dll"; Components: libs; Tasks: x64
; and xtray
[Icons] [Icons]
Name: "{group}\XChat-WDK"; Filename: "{app}\xchat.exe"; Tasks: not portable Name: "{group}\XChat-WDK"; Filename: "{app}\xchat.exe"; Tasks: not portable

14
plugins/makefile.mak
View File

@ -11,8 +11,8 @@ all:
@-$(MAKE) /nologo /s /f makefile.mak $@ @-$(MAKE) /nologo /s /f makefile.mak $@
# @cd ..\xdcc # @cd ..\xdcc
# @-$(MAKE) /nologo /s /f makefile.mak $@ # @-$(MAKE) /nologo /s /f makefile.mak $@
# @cd ..\xtray @cd ..\xtray
# @-$(MAKE) /nologo /s /f makefile.mak $@ @-$(MAKE) /nologo /s /f makefile.mak $@
@cd ..\winamp @cd ..\winamp
@-$(MAKE) /nologo /s /f makefile.mak $@ @-$(MAKE) /nologo /s /f makefile.mak $@
@ -47,11 +47,11 @@ clean:
# @del xdcc\*.exp # @del xdcc\*.exp
# @del xdcc\*.lib # @del xdcc\*.lib
# @del xdcc\*.obj # @del xdcc\*.obj
# @del xtray\*.def @del xtray\*.def
# @del xtray\*.dll @del xtray\*.dll
# @del xtray\*.exp @del xtray\*.exp
# @del xtray\*.lib @del xtray\*.lib
# @del xtray\*.obj @del xtray\*.obj
@del winamp\*.def @del winamp\*.def
@del winamp\*.dll @del winamp\*.dll
@del winamp\*.exp @del winamp\*.exp