From 87d7c1be4bd70e031bc95484762d555a4b997647 Mon Sep 17 00:00:00 2001 From: Nguyen Anh Quynh Date: Mon, 19 Dec 2016 22:01:50 +0800 Subject: [PATCH] docs: remove glib dependency --- docs/COMPILE-NIX.md | 28 +++++----------------------- docs/COMPILE-WINDOWS.md | 23 ++++------------------- 2 files changed, 9 insertions(+), 42 deletions(-) diff --git a/docs/COMPILE-NIX.md b/docs/COMPILE-NIX.md index 6853908d..90637744 100644 --- a/docs/COMPILE-NIX.md +++ b/docs/COMPILE-NIX.md @@ -8,24 +8,10 @@ To compile for Microsoft Windows, see [COMPILE-WINDOWS.md](COMPILE-WINDOWS.md) [0] Dependencies -Unicorn requires few dependent packages as follows. - -- For Mac OS X, "pkg-config" and "glib" are needed. - Brew users can install "pkg-config" and "glib" with: - - $ brew install pkg-config glib - - NOTE: to build Unicorn universal binaries (which support both 32-bit & - 64-bit), you need to have glib in universal format. To do that, build & - install glib with: - - $ brew install glib --universal - -- For Linux, "glib2-dev" is needed. - Ubuntu/Debian users can install this with: - - $ sudo apt-get install libglib2.0-dev +For MacOS, Unicorn requires "pkg-config" package. +Brew users can install this with: + $ brew install pkg-config [1] Tailor Unicorn to your need. @@ -75,12 +61,8 @@ To build Unicorn on *nix (such as MacOSX, Linux, *BSD, Solaris): $ UNICORN_QEMU_FLAGS="--python=/path/to/python2" ./make.sh -- To cross-compile Unicorn on 64-bit Linux to target 32-bit binary, install - libglib2.0-dev for i386. On Ubuntu, this can be done with: - - $ sudo apt-get install libglib2.0-dev:i386 - - Then cross-compile to 32-bit with: +- To cross-compile Unicorn on 64-bit Linux to target 32-bit binary, + cross-compile to 32-bit with: $ ./make.sh linux32 diff --git a/docs/COMPILE-WINDOWS.md b/docs/COMPILE-WINDOWS.md index 8bdcec15..96c65c45 100644 --- a/docs/COMPILE-WINDOWS.md +++ b/docs/COMPILE-WINDOWS.md @@ -7,9 +7,8 @@ To compile for Linux, Mac OS X and Unix-based OS, see [COMPILE-NIX.md](COMPILE-N [0] Dependencies -For Windows, cross-compile requires Mingw. Mingw-glib2 is needed. -At the moment, it is confirmed that Unicorn can be compiled either on Ubuntu -or Windows. +For Windows, cross-compile requires Mingw. At the moment, it is confirmed that +Unicorn can be compiled either on Ubuntu or Windows. - On Ubuntu 14.04 64-bit, do: @@ -17,14 +16,6 @@ or Windows. https://launchpad.net/~greg-hellings/+archive/ubuntu/mingw-libs/+build/2924251 - - To cross-compile for Windows 32-bit, install Mingw with (ignore all the warnings): - - $ sudo dpkg -i --force-depends mingw64-x86-glib2_2.31.0_all.deb - - To cross-compile for Windows 64-bit, install Mingw with: - - $ sudo dpkg -i --force-depends mingw64-x64-glib2_2.31.0_all.deb - - On Windows, install MinGW via package MSYS2 at https://msys2.github.io/ @@ -43,7 +34,6 @@ or Windows. $ pacman -S python2 $ pacman -S make $ pacman -S pkg-config - $ pacman -S mingw-w64-i686-glib2 $ pacman -S mingw-w64-i686-toolchain - To compile for Windows 64-bit, run: @@ -51,15 +41,14 @@ or Windows. $ pacman -S python2 $ pacman -S make $ pacman -S pkg-config - $ pacman -S mingw-w64-x86_64-glib2 $ pacman -S mingw-w64-x86_64-toolchain - For Cygwin, "make", "gcc-core", "pkg-config", "libpcre-devel", "zlib-devel" - and "libglib2.0-devel" are needed. + are needed. If apt-cyg is available, you can install these with: - $ apt-cyg install make gcc-core pkg-config libpcre-devel zlib-devel libglib2.0-devel + $ apt-cyg install make gcc-core pkg-config libpcre-devel zlib-devel @@ -111,7 +100,6 @@ To run sample_x86.exe on Windows 32-bit, you need the following files: unicorn.dll %MSYS2%\mingw32\bin\libgcc_s_dw2-1.dll - %MSYS2%\mingw32\bin\libglib-2.0-0.dll %MSYS2%\mingw32\bin\libiconv-2.dll %MSYS2%\mingw32\bin\libintl-8.dll %MSYS2%\mingw32\bin\libpcre-1.dll @@ -121,7 +109,6 @@ To run sample_x86.exe on Windows 64-bit, you need the following files: unicorn.dll %MSYS2%\mingw64\bin\libgcc_s_seh-1.dll - %MSYS2%\mingw64\bin\libglib-2.0-0.dll %MSYS2%\mingw64\bin\libiconv-2.dll %MSYS2%\mingw64\bin\libintl-8.dll %MSYS2%\mingw64\bin\libpcre-1.dll @@ -171,14 +158,12 @@ be used on Windows machine. To run sample_x86.exe on Windows 32-bit, you need the following files: unicorn.dll - /usr/i686-w64-mingw32/sys-root/mingw/bin/libglib-2.0-0.dll /usr/lib/gcc/i686-w64-mingw32/4.8/libgcc_s_sjlj-1.dll /usr/i686-w64-mingw32/lib/libwinpthread-1.dll To run sample_x86.exe on Windows 64-bit, you need the following files: unicorn.dll - /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libglib-2.0-0.dll /usr/lib/gcc/x86_64-w64-mingw32/4.8/libgcc_s_sjlj-1.dll /usr/x86_64-w64-mingw32/lib/libwinpthread-1.dll