Fix Win32Depends.cmake, update README
This commit is contained in:
parent
b4db65d246
commit
7f357cb7c8
13
README.adoc
13
README.adoc
|
@ -3,8 +3,7 @@ logdiag
|
||||||
|
|
||||||
'logdiag' is a simple multiplatform schematic editor written in GTK+.
|
'logdiag' is a simple multiplatform schematic editor written in GTK+.
|
||||||
|
|
||||||
This software is considered to be of alpha quality and isn't recommended for
|
This software has never really been finished, and is no longer being worked on.
|
||||||
regular usage.
|
|
||||||
|
|
||||||
image::docs/user-guide/logdiag-en.png[align="center"]
|
image::docs/user-guide/logdiag-en.png[align="center"]
|
||||||
|
|
||||||
|
@ -16,7 +15,7 @@ a package with the latest development version from Archlinux's AUR.
|
||||||
Requirements
|
Requirements
|
||||||
------------
|
------------
|
||||||
Runtime dependencies: GTK+ >= 3.8, json-glib >= 0.10.4, lua >= 5.2 +
|
Runtime dependencies: GTK+ >= 3.8, json-glib >= 0.10.4, lua >= 5.2 +
|
||||||
Build dependencies: CMake >= 2.8
|
Build dependencies: CMake >= 2.8.12
|
||||||
|
|
||||||
Build from source on Unix-like systems
|
Build from source on Unix-like systems
|
||||||
--------------------------------------
|
--------------------------------------
|
||||||
|
@ -47,11 +46,9 @@ CMake offers DEB and RPM.
|
||||||
|
|
||||||
After _cpack_ finishes making the package, install this file.
|
After _cpack_ finishes making the package, install this file.
|
||||||
|
|
||||||
$ fakeroot cpack -G DEB
|
$ cpack -G DEB
|
||||||
# dpkg -i logdiag-version-system-arch.deb
|
# dpkg -i logdiag-version-system-arch.deb
|
||||||
|
|
||||||
Leave out the fakeroot for CMake >= 2.8.9, it's been fixed since.
|
|
||||||
|
|
||||||
Build from source on Windows
|
Build from source on Windows
|
||||||
----------------------------
|
----------------------------
|
||||||
_Note that with the current method we're stuck with GTK+ 3.10.4 at best._
|
_Note that with the current method we're stuck with GTK+ 3.10.4 at best._
|
||||||
|
@ -78,11 +75,11 @@ Let CMake prepare the build:
|
||||||
Now you can generate a package with CPack. You may choose between:
|
Now you can generate a package with CPack. You may choose between:
|
||||||
|
|
||||||
1. An NSIS-based installation package:
|
1. An NSIS-based installation package:
|
||||||
|
+
|
||||||
> cpack -G NSIS
|
> cpack -G NSIS
|
||||||
|
|
||||||
2. A portable ZIP package:
|
2. A portable ZIP package:
|
||||||
|
+
|
||||||
> cpack -G ZIP
|
> cpack -G ZIP
|
||||||
|
|
||||||
By default, that is if you specify no generator, both packages are built.
|
By default, that is if you specify no generator, both packages are built.
|
||||||
|
|
|
@ -31,7 +31,7 @@ set (pkg_gtk_root "http://ftp.gnome.org/pub/gnome/binaries/win32")
|
||||||
set (pkg_gtk_urls "${pkg_gtk_root}/dependencies/gettext-tools-0.17.zip")
|
set (pkg_gtk_urls "${pkg_gtk_root}/dependencies/gettext-tools-0.17.zip")
|
||||||
set (pkg_gtk_md5 "09baff956ebd1c391c7f71e9bd768edd")
|
set (pkg_gtk_md5 "09baff956ebd1c391c7f71e9bd768edd")
|
||||||
|
|
||||||
set (pkg_gtkalt_root "http://win32builder.gnome.org")
|
set (pkg_gtkalt_root "https://download.geany.org/contrib/gtk")
|
||||||
set (pkg_gtkalt_urls "${pkg_gtkalt_root}/gtk+-bundle_3.8.2-20131001_win32.zip")
|
set (pkg_gtkalt_urls "${pkg_gtkalt_root}/gtk+-bundle_3.8.2-20131001_win32.zip")
|
||||||
set (pkg_gtkalt_md5 "3f9b159207edf44937f209b4a5e6bb63")
|
set (pkg_gtkalt_md5 "3f9b159207edf44937f209b4a5e6bb63")
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue