diff --git a/win32/zoitechat.props b/win32/zoitechat.props index 473063ba..3ae6f0b0 100644 --- a/win32/zoitechat.props +++ b/win32/zoitechat.props @@ -14,7 +14,7 @@ - GTK_DISABLE_DEPRECATED;GDK_PIXBUF_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;HAVE_X509_GET_SIGNATURE_NID;HAVE_SSL_CTX_GET_SSL_METHOD;DEFAULT_CERT_FILE="cert.pem";HAVE_STRTOULL;strtoull=_strtoui64;strcasecmp=stricmp;strncasecmp=strnicmp;__inline__=__inline;$(GtkDefines) + GTK_DISABLE_DEPRECATED;GDK_PIXBUF_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;HAVE_X509_GET_SIGNATURE_NID;HAVE_SSL_CTX_GET_SSL_METHOD;DEFAULT_CERT_FILE="cert.pem";HAVE_STRTOULL;strtoull=_strtoui64;strcasecmp=stricmp;strncasecmp=strnicmp;__inline__=__inline $(YourDepsPath)\$(PlatformName)\release $(YourGendefPath) @@ -24,70 +24,12 @@ $(YourPython3Path)\$(PlatformName) python314 hcpython3 - true - false - true - false - true - false - $(DepsRoot)\include\luajit-2.1 - $(DepsRoot)\include\luajit - $(DepsRoot)\include\lua5.1 - $(DepsRoot)\include\lua51 - hclua - lua51 - luajit-5.1 - luajit - true - lua51.dll - luajit-5.1.dll - luajit.dll - $(DepsRoot)\share\lua\2.1 - $(DepsRoot)\share\lua\5.1 - $(DepsRoot)\lib\lua\2.1 - $(DepsRoot)\lib\lua\5.1 - false - "$(DepsRoot)\bin\glib-genmarshal.exe" - "$(Python3Path)\python.exe" "$(DepsRoot)\bin\glib-genmarshal" + $(DepsRoot)\include\luajit-2.1 + hclua + lua51 $(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2 - true - HAVE_GTK3 - $(DepsRoot)\include\gtk-3.0;$(DepsRoot)\lib\gtk-3.0\include - $(DepsRoot)\include\atk-1.0;$(DepsRoot)\include\cairo;$(DepsRoot)\include\pango-1.0;$(DepsRoot)\include\gdk-pixbuf-2.0;$(DepsRoot)\include\harfbuzz - $(Gtk3);$(GtkCommon) - ssleay32.lib - libeay32.lib - libssl.lib - libcrypto.lib - $(SslModernLib);$(CryptoModernLib) - $(SslLegacyLib);$(CryptoLegacyLib) - $(DepsRoot)\include - - gtk-3.lib - gtk-3.0.lib - libgtk-3.lib - libgtk-3.0.lib - gdk-3.lib - gdk-3.0.lib - libgdk-3.lib - libgdk-3.0.lib - intl.lib - libintl.lib - iconv.lib - libiconv.lib - zlib1.lib - zlib.lib - libxml2.lib - xml2.lib - libxml2-2.lib - jpeg.lib - libjpeg.lib - libjpeg-8.lib - libjpeg-9.lib - libpng16.lib - libpng16_static.lib - libpng.lib - $(Gtk3Lib);$(Gdk3Lib);wininet.lib;winmm.lib;ws2_32.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;$(IntlLib);$(IconvLib);$(ZlibLib);$(Xml2Lib);$(JpegLib);$(PngLib);$(OpenSslLibs) + $(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;intl.lib;libxml2.lib;libcrypto.lib;libssl.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib $(SolutionDir)..\data\\ $(SolutionDir)..\..\zoitechat-build $(ZoiteChatBuild)\$(PlatformName)\bin\ @@ -95,7 +37,7 @@ $(ZoiteChatBuild)\$(PlatformName)\lib\ $(ZoiteChatBuild)\$(PlatformName)\pdb\ $(ZoiteChatBuild)\$(PlatformName)\rel\ - "$(ProgramFiles (x86))\Inno Setup 5\iscc.exe" + "$(ProgramFiles)\Inno Setup 5\iscc.exe" @@ -139,4 +81,3 @@ -