From 1aacba3b4600c3ea48ede248ba78d3f81d74dac2 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 14 Apr 2014 12:31:41 -0700 Subject: [PATCH 1/3] changes to Windows instructions for GnuTLS --- BUILD.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BUILD.md b/BUILD.md index c5a7a604b4..33e18545e0 100644 --- a/BUILD.md +++ b/BUILD.md @@ -141,9 +141,9 @@ For many of the external libraries where precompiled binaries are readily availa *NOTE: Qt does not support 64-bit builds on Windows 7, so you must use the 32-bit version of libraries for interface.exe to run. The 32-bit version of the static library is the one linked by our CMake find modules* #####GnuTLS -You can get a precompiled version of GnuTLS for Windows [here](ftp://ftp.gnutls.org/gcrypt/gnutls/w32/). +You can get a precompiled version of GnuTLS for Windows [here](http://gnutls.org/download.html). -To use GnuTLS with Visual Studio, you will need to create `libgnutls-28.lib`, the import library for Visual Studio projects. this is done using the `lib` command in the `bin` folder of your GnuTLS download. +To use GnuTLS with Visual Studio, you will need to create `libgnutls-28.lib`, the import library for Visual Studio projects. this is done using the `lib` command in the `bin` folder of your GnuTLS download. Run the following in a Visual Studio Command Prompt (found in the tools menu of Visual Studio). $GNUTLS_DIR\bin> lib /def:libgnutls-28.def From d3776afc93b7eed1d9b61ffd1859f2de3482ab07 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 14 Apr 2014 12:36:13 -0700 Subject: [PATCH 2/3] fix for DLL section in BUILD guide --- BUILD.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/BUILD.md b/BUILD.md index 33e18545e0..b855ed1450 100644 --- a/BUILD.md +++ b/BUILD.md @@ -140,6 +140,11 @@ For many of the external libraries where precompiled binaries are readily availa *NOTE: Qt does not support 64-bit builds on Windows 7, so you must use the 32-bit version of libraries for interface.exe to run. The 32-bit version of the static library is the one linked by our CMake find modules* +##### DLLs +As with the Qt libraries, you will need to make sure the directories containing dynamically-linked libraries is in your path. + +For example, for a dynamically linked build of freeglut, the directory to add to your path in which the DLL is found is `FREEGLUT_DIR/bin`. Where possible, you can use static builds of the external dependencies to avoid this requirement. + #####GnuTLS You can get a precompiled version of GnuTLS for Windows [here](http://gnutls.org/download.html). @@ -149,9 +154,6 @@ To use GnuTLS with Visual Studio, you will need to create `libgnutls-28.lib`, th This will create `libgnutls-28.lib` in the `bin` folder. Copy that file to the `lib` sub-folder of your GnuTLS folder, and the Cmake FindGnuTLS module in this repo will find it during the Cmake run. -#### DLLs -As with the Qt libraries, you will need to make sure the directory containing dynamically-linked libraries is in your path. For example, for a dynamically linked build of freeglut, the directory to add to your path in which the DLL is found is `FREEGLUT_DIR/bin`. Where possible, you can use static builds of the external dependencies to avoid this requirement. - ####Building in Visual Studio Follow the same build steps from the CMake section, but pass a different generator to CMake. From 55172c6f437a23506004d802cf4cd9184a8a1a15 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 14 Apr 2014 12:39:43 -0700 Subject: [PATCH 3/3] more cleanup to BUILD guide for windows --- BUILD.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/BUILD.md b/BUILD.md index b855ed1450..487bcb0eb1 100644 --- a/BUILD.md +++ b/BUILD.md @@ -108,11 +108,12 @@ Once Qt is installed, you need to manually configure the following: NOTE: zLib should configure itself correctly on install. However, sometimes zLib doesn't properly detect system components and fails to configure itself correctly. When it fails, it will not correctly set the #if HAVE_UNISTD_H at line 287 of zconf.h to #if 0... if it fails, you're build will have errors in the voxels target. You can correct this by setting the #if to 0 instead of 1, since Windows does not have unistd.h. ####External Libraries -We don't currently have a Windows installer, so before running Interface, you will need to ensure that all required resources are loadable. -CMake will need to know where the headers and libraries for required external dependencies are. If you installed ZLIB using the installer, the FindZLIB cmake module will be able to find it. This isn't the case for the others. +CMake will need to know where the headers and libraries for required external dependencies are. -The recommended route for CMake to find external dependencies is to place all of the dependencies in one folder and set one ENV variable - HIFI_LIB_DIR. That ENV variable should point to a directory with the following structure: +If you installed zLib using the installer, the Cmake find module for zLib should locate it on your system. + +The recommended route for CMake to find the other external dependencies is to place all of the dependencies in one folder and set one ENV variable - HIFI_LIB_DIR. That ENV variable should point to a directory with the following structure: root_lib_dir -> glm @@ -134,10 +135,10 @@ The recommended route for CMake to find external dependencies is to place all of -> include -> lib -*NOTE: Be careful with glm. For the folder other libraries would normally call 'include', the folder containing the headers, glm opts to use 'glm'. You will have a glm folder nested inside the top-level glm folder.* - For many of the external libraries where precompiled binaries are readily available you should be able to simply copy the extracted folder that you get from the download links provided at the top of the guide. Otherwise you may need to build from source and install the built product to this directory. The `root_lib_dir` in the above example can be wherever you choose on your system - as long as the environment variable HIFI_LIB_DIR is set to it. +*NOTE: Be careful with glm. For the folder other libraries would normally call 'include', the folder containing the headers, glm opts to use 'glm'. You will have a glm folder nested inside the top-level glm folder.* + *NOTE: Qt does not support 64-bit builds on Windows 7, so you must use the 32-bit version of libraries for interface.exe to run. The 32-bit version of the static library is the one linked by our CMake find modules* ##### DLLs