diff options
| author | Berke Viktor <bviktor@hexchat.org> | 2012-11-03 02:33:44 +0100 |
|---|---|---|
| committer | Berke Viktor <bviktor@hexchat.org> | 2012-11-03 02:33:44 +0100 |
| commit | c65e16fd00dd3ceacac301f2f774bdf29cf211d2 (patch) | |
| tree | 15aa703dad51c6a0982059fda24f6dca0d4a08ae /win32 | |
| parent | 259ed9644d1788d33c7d7532f94ebd4e1d123edb (diff) | |
Relocate hexchat.png and hexchat.ico and some more varname cleanup
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/hexchat-xp.props | 2 | ||||
| -rw-r--r-- | win32/hexchat.props | 2 | ||||
| -rw-r--r-- | win32/installer/installer-xp.vcxproj | 4 | ||||
| -rw-r--r-- | win32/installer/installer.vcxproj | 4 | ||||
| -rw-r--r-- | win32/spelling/build-spelling.bat | 3 |
5 files changed, 8 insertions, 7 deletions
diff --git a/win32/hexchat-xp.props b/win32/hexchat-xp.props index 7f4f9e50..5d6f7e48 100644 --- a/win32/hexchat-xp.props +++ b/win32/hexchat-xp.props @@ -34,7 +34,7 @@ <PythonOutput>hcpython</PythonOutput> <Glib>$(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2</Glib> <Gtk>$(DepsRoot)\include\gtk-2.0;$(DepsRoot)\lib\gtk-2.0\include;$(DepsRoot)\include\atk-1.0;$(DepsRoot)\include\cairo;$(DepsRoot)\include\pango-1.0;$(DepsRoot)\include\gdk-pixbuf-2.0</Gtk> - <Pixmaps>png_ulist_voice "$(SolutionDir)\..\src\pixmaps\ulist_voice.png" png_ulist_halfop "$(SolutionDir)\..\src\pixmaps\ulist_halfop.png" png_ulist_op "$(SolutionDir)\..\src\pixmaps\ulist_op.png" png_ulist_owner "$(SolutionDir)\..\src\pixmaps\ulist_owner.png" png_ulist_founder "$(SolutionDir)\..\src\pixmaps\ulist_founder.png" png_ulist_netop "$(SolutionDir)\..\src\pixmaps\ulist_netop.png" bookpng "$(SolutionDir)\..\src\pixmaps\book.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" channelpng "$(SolutionDir)\..\src\pixmaps\channel.png" dialogpng "$(SolutionDir)\..\src\pixmaps\dialog.png" serverpng "$(SolutionDir)\..\src\pixmaps\server.png" utilpng "$(SolutionDir)\..\src\pixmaps\util.png" hexchatpng "$(SolutionDir)\..\hexchat.png"</Pixmaps> + <Pixmaps>png_ulist_voice "$(SolutionDir)\..\src\pixmaps\ulist_voice.png" png_ulist_halfop "$(SolutionDir)\..\src\pixmaps\ulist_halfop.png" png_ulist_op "$(SolutionDir)\..\src\pixmaps\ulist_op.png" png_ulist_owner "$(SolutionDir)\..\src\pixmaps\ulist_owner.png" png_ulist_founder "$(SolutionDir)\..\src\pixmaps\ulist_founder.png" png_ulist_netop "$(SolutionDir)\..\src\pixmaps\ulist_netop.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" channelpng "$(SolutionDir)\..\src\pixmaps\channel.png" dialogpng "$(SolutionDir)\..\src\pixmaps\dialog.png" serverpng "$(SolutionDir)\..\src\pixmaps\server.png" utilpng "$(SolutionDir)\..\src\pixmaps\util.png" png_book "$(SolutionDir)\..\src\pixmaps\book.png" png_hexchat "$(SolutionDir)\..\src\pixmaps\hexchat.png"</Pixmaps> <DepLibs>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;libxml2.lib;libeay32.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib</DepLibs> <HexChatBuild>$(SolutionDir)build-xp</HexChatBuild> <HexChatBin>$(HexChatBuild)\$(PlatformName)\bin\</HexChatBin> diff --git a/win32/hexchat.props b/win32/hexchat.props index 4613116e..947db34c 100644 --- a/win32/hexchat.props +++ b/win32/hexchat.props @@ -36,7 +36,7 @@ <PythonOutput>hcpython</PythonOutput> <Glib>$(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2</Glib> <Gtk>$(DepsRoot)\include\gtk-2.0;$(DepsRoot)\lib\gtk-2.0\include;$(DepsRoot)\include\atk-1.0;$(DepsRoot)\include\cairo;$(DepsRoot)\include\pango-1.0;$(DepsRoot)\include\gdk-pixbuf-2.0</Gtk> - <Pixmaps>png_ulist_voice "$(SolutionDir)\..\src\pixmaps\ulist_voice.png" png_ulist_halfop "$(SolutionDir)\..\src\pixmaps\ulist_halfop.png" png_ulist_op "$(SolutionDir)\..\src\pixmaps\ulist_op.png" png_ulist_owner "$(SolutionDir)\..\src\pixmaps\ulist_owner.png" png_ulist_founder "$(SolutionDir)\..\src\pixmaps\ulist_founder.png" png_ulist_netop "$(SolutionDir)\..\src\pixmaps\ulist_netop.png" bookpng "$(SolutionDir)\..\src\pixmaps\book.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" channelpng "$(SolutionDir)\..\src\pixmaps\channel.png" dialogpng "$(SolutionDir)\..\src\pixmaps\dialog.png" serverpng "$(SolutionDir)\..\src\pixmaps\server.png" utilpng "$(SolutionDir)\..\src\pixmaps\util.png" hexchatpng "$(SolutionDir)\..\hexchat.png"</Pixmaps> + <Pixmaps>png_ulist_voice "$(SolutionDir)\..\src\pixmaps\ulist_voice.png" png_ulist_halfop "$(SolutionDir)\..\src\pixmaps\ulist_halfop.png" png_ulist_op "$(SolutionDir)\..\src\pixmaps\ulist_op.png" png_ulist_owner "$(SolutionDir)\..\src\pixmaps\ulist_owner.png" png_ulist_founder "$(SolutionDir)\..\src\pixmaps\ulist_founder.png" png_ulist_netop "$(SolutionDir)\..\src\pixmaps\ulist_netop.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" channelpng "$(SolutionDir)\..\src\pixmaps\channel.png" dialogpng "$(SolutionDir)\..\src\pixmaps\dialog.png" serverpng "$(SolutionDir)\..\src\pixmaps\server.png" utilpng "$(SolutionDir)\..\src\pixmaps\util.png" png_book "$(SolutionDir)\..\src\pixmaps\book.png" png_hexchat "$(SolutionDir)\..\src\pixmaps\hexchat.png"</Pixmaps> <DepLibs>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;libintl.lib;libxml2.lib;libeay32.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib</DepLibs> <HexChatBuild>$(SolutionDir)build</HexChatBuild> <HexChatBin>$(HexChatBuild)\$(PlatformName)\bin\</HexChatBin> diff --git a/win32/installer/installer-xp.vcxproj b/win32/installer/installer-xp.vcxproj index 3870825f..5efac280 100644 --- a/win32/installer/installer-xp.vcxproj +++ b/win32/installer/installer-xp.vcxproj @@ -69,7 +69,7 @@ echo WizardSmallImageFile="$(ProjectDir)\wizardsmallimage.bmp" >> "$(OutDi "$(OutDir)\version" -v >> "$(OutDir)\hexchat-xp-x86.iss" "$(OutDir)\version" -i >> "$(OutDir)\hexchat-xp-x86.iss" "$(OutDir)\version" -o >> "$(OutDir)\hexchat-xp-x86.iss" -echo SetupIconFile="$(SolutionDir)\..\hexchat.ico" >> "$(OutDir)\hexchat-xp-x86.iss" +echo SetupIconFile="$(SolutionDir)\..\share\icons\hexchat.ico" >> "$(OutDir)\hexchat-xp-x86.iss" type hexchat-xp-x86.skel.iss >> "$(OutDir)\hexchat-xp-x86.iss" "$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\hexchat-xp-x86.iss"</Command> </PreBuildEvent> @@ -93,7 +93,7 @@ echo WizardSmallImageFile="$(ProjectDir)\wizardsmallimage.bmp" >> "$(OutDi "$(OutDir)\version" -v >> "$(OutDir)\hexchat-xp-x64.iss" "$(OutDir)\version" -i >> "$(OutDir)\hexchat-xp-x64.iss" "$(OutDir)\version" -o >> "$(OutDir)\hexchat-xp-x64.iss" -echo SetupIconFile="$(SolutionDir)\..\hexchat.ico" >> "$(OutDir)\hexchat-xp-x64.iss" +echo SetupIconFile="$(SolutionDir)\..\share\icons\hexchat.ico" >> "$(OutDir)\hexchat-xp-x64.iss" type hexchat-xp-x64.skel.iss >> "$(OutDir)\hexchat-xp-x64.iss" "$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\hexchat-xp-x64.iss"</Command> </PreBuildEvent> diff --git a/win32/installer/installer.vcxproj b/win32/installer/installer.vcxproj index ea707d26..442cc654 100644 --- a/win32/installer/installer.vcxproj +++ b/win32/installer/installer.vcxproj @@ -66,7 +66,7 @@ echo WizardSmallImageFile="$(ProjectDir)\wizardsmallimage.bmp" >> "$(OutDi "$(OutDir)\version" -v >> "$(OutDir)\hexchat-x86.iss" "$(OutDir)\version" -i >> "$(OutDir)\hexchat-x86.iss" "$(OutDir)\version" -o >> "$(OutDir)\hexchat-x86.iss" -echo SetupIconFile="$(SolutionDir)\..\hexchat.ico" >> "$(OutDir)\hexchat-x86.iss" +echo SetupIconFile="$(SolutionDir)\..\share\icons\hexchat.ico" >> "$(OutDir)\hexchat-x86.iss" type hexchat-x86.skel.iss >> "$(OutDir)\hexchat-x86.iss" "$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\hexchat-x86.iss"</Command> </PreBuildEvent> @@ -90,7 +90,7 @@ echo WizardSmallImageFile="$(ProjectDir)\wizardsmallimage.bmp" >> "$(OutDi "$(OutDir)\version" -v >> "$(OutDir)\hexchat-x64.iss" "$(OutDir)\version" -i >> "$(OutDir)\hexchat-x64.iss" "$(OutDir)\version" -o >> "$(OutDir)\hexchat-x64.iss" -echo SetupIconFile="$(SolutionDir)\..\hexchat.ico" >> "$(OutDir)\hexchat-x64.iss" +echo SetupIconFile="$(SolutionDir)\..\share\icons\hexchat.ico" >> "$(OutDir)\hexchat-x64.iss" type hexchat-x64.skel.iss >> "$(OutDir)\hexchat-x64.iss" "$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\hexchat-x64.iss"</Command> </PreBuildEvent> diff --git a/win32/spelling/build-spelling.bat b/win32/spelling/build-spelling.bat index db83ef12..1c58574e 100644 --- a/win32/spelling/build-spelling.bat +++ b/win32/spelling/build-spelling.bat @@ -12,8 +12,9 @@ cd .. echo [Setup] > build\spelling\hexchat-spelling.iss echo WizardImageFile=%cd%\installer\wizardimage.bmp >> build\spelling\hexchat-spelling.iss echo WizardSmallImageFile=%cd%\installer\wizardsmallimage.bmp >> build\spelling\hexchat-spelling.iss -cd .. +cd ..\share\icons echo SetupIconFile=%cd%\hexchat.ico >> win32\build\spelling\hexchat-spelling.iss +cd ..\.. type win32\spelling\hexchat-spelling.skel.iss >> win32\build\spelling\hexchat-spelling.iss set PATH=%PROGRAMFILES(X86)%\Inno Setup 5 compil32 /cc win32\build\spelling\hexchat-spelling.iss |