X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=INSTALL.markdown;h=2228bdff860368cdf72203e97f0b62a54683b736;hb=ebe01ce9942e570f23b40793e97cf02b6f3616ee;hp=60b2b09cd5ff31c239bc6a6b90c14a2d6b5ba66c;hpb=2defc1f36e18d389e8ee1b6cb5a4eaf98bdc6abd;p=apitrace diff --git a/INSTALL.markdown b/INSTALL.markdown index 60b2b09..2228bdf 100644 --- a/INSTALL.markdown +++ b/INSTALL.markdown @@ -16,12 +16,12 @@ Requirements common for all platforms: The GUI also dependends on: -* Qt version 4.7 +* Qt version 4.7 or higher (tested with version 4.8) * QJSON version 0.5 or higher (tested with version 0.7.1, which is bundled) Qt and QJSON will be required if `-DENABLE_GUI=TRUE` is passed to CMake, and -never used if `-DENABLED_GUI=FALSE` is passed instead. The implicit default is +never used if `-DENABLE_GUI=FALSE` is passed instead. The implicit default is `-DENABLE_GUI=AUTO`, which will build the GUI if Qt is available, using the bundled QJSON if it is not found on the system. @@ -40,17 +40,23 @@ Build as: cmake -H. -Bbuild make -C build -You can also build the 32bit GL wrapper on 64bit distro with a multilib gcc by -doing: + +You can also build the 32-bits GL wrapper on a 64-bits distribution, provided +you have a multilib gcc and 32-bits X11 libraries, by doing: cmake \ -DCMAKE_C_FLAGS=-m32 \ -DCMAKE_CXX_FLAGS=-m32 \ -DCMAKE_EXE_LINKER_FLAGS=-m32 \ + -DCMAKE_SYSTEM_LIBRARY_PATH=/usr/lib32 \ -DENABLE_GUI=FALSE \ -H. -Bbuild32 make -C build32 glxtrace +The `/usr/lib32` refers to the path where the 32-bits shared objects are may +differ depending on the actual Linux distribution. + + Android ------- @@ -89,7 +95,7 @@ Additional requirements: To build with Visual Studio first invoke CMake GUI as: - cmake-gui -H. -B%cd%\build + cmake-gui -H%cd% -B%cd%\build and press the _Configure_ button.