diff --git a/win32/hexchat.props b/win32/hexchat.props index 8af53c79..510fae4a 100644 --- a/win32/hexchat.props +++ b/win32/hexchat.props @@ -30,9 +30,9 @@ $(YourPython3Path)\$(PlatformName) python34 hcpython3 - $(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2 + $(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include $(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-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 + 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;libeay32.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib $(SolutionDir)..\data\\ $(SolutionDir)..\..\hexchat-build $(HexChatBuild)\$(PlatformName)\bin\ @@ -51,7 +51,6 @@ copy "$(HexChatBin)hexchat-text.exe" "$(HexChatRel)" copy "$(HexChatBin)thememan.exe" "$(HexChatRel)" copy "$(DepsRoot)\bin\atk-1.0.dll" "$(HexChatRel)" copy "$(DepsRoot)\bin\cairo.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\fontconfig.dll" "$(HexChatRel)" copy "$(DepsRoot)\bin\gdk_pixbuf-2.0.dll" "$(HexChatRel)" copy "$(DepsRoot)\bin\gdk-win32-2.0.dll" "$(HexChatRel)" copy "$(DepsRoot)\bin\gio-2.0.dll" "$(HexChatRel)" @@ -66,10 +65,8 @@ copy "$(DepsRoot)\bin\libeay32.dll" "$(HexChatRel)" copy "$(DepsRoot)\bin\libenchant.dll" "$(HexChatRel)" copy "$(DepsRoot)\bin\libintl.dll" "$(HexChatRel)" copy "$(DepsRoot)\bin\libpng16.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\libxml2.dll" "$(HexChatRel)" copy "$(DepsRoot)\bin\pango-1.0.dll" "$(HexChatRel)" copy "$(DepsRoot)\bin\pangocairo-1.0.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\pangoft2-1.0.dll" "$(HexChatRel)" copy "$(DepsRoot)\bin\pangowin32-1.0.dll" "$(HexChatRel)" copy "$(DepsRoot)\bin\pixman-1.dll" "$(HexChatRel)" copy "$(DepsRoot)\bin\ssleay32.dll" "$(HexChatRel)" diff --git a/win32/installer/hexchat.iss.tt b/win32/installer/hexchat.iss.tt index 0ccf2097..43869f84 100644 --- a/win32/installer/hexchat.iss.tt +++ b/win32/installer/hexchat.iss.tt @@ -117,7 +117,6 @@ Source: "share\locale\*"; DestDir: "{app}\share\locale"; Flags: ignoreversion cr Source: "atk-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "cairo.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs -Source: "fontconfig.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "gdk_pixbuf-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "gdk-win32-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "gio-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs @@ -132,10 +131,8 @@ Source: "libeay32.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "libenchant.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "libintl.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "libpng16.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs -Source: "libxml2.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "pango-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "pangocairo-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs -Source: "pangoft2-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "pangowin32-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "pixman-1.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "ssleay32.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs