summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
Diffstat (limited to 'README.md')
-rw-r--r--README.md23
1 files changed, 17 insertions, 6 deletions
diff --git a/README.md b/README.md
index bac0efab4c..690d6a0128 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,14 @@
# Mapbox GL Qt on Windows
-![Mapbox GL Qt on Windows](mapbox-gl-native.png "Mapbox GL Qt on Windows")
+![Mapbox GL Qt on Windows](mapbox-gl-native1.png "Mapbox GL Qt on Windows")
## Testing environment
-- Qt 5.9.3 for Windows with MinGW 32-bits (won't build with MSVC)
-- Qt Creator
+- Qt 5.7.1 MSVC 2016 Win64
+- LLVM 5.0 Win64
+- OpenSSL 1.0.2n Win64
+- Visual Studio Community 2015 Update 3
+- Qt Creator 4.5.0
- Windows 10
- DirectX 11
@@ -13,8 +16,16 @@
## Building instructions
1. Open the ```mapbox-gl-native.pro``` project file with Qt Creator
-2. Select the **Release** configuration
-3. Hit the **Play** button or **CTRL+R** to build and run the project
+2. Go to Projects -> Manage Kits
+3. Change the "MSVC2015_64bit" kit to use "LLVM 64bit based on MSVC2015" compiler
+4. QtCreator doesn't always save this configuration, you might need to do it every time after opening the project
+
+![Changing the compiler to LLVM](mapbox-gl-native2.png "Changing the compiler to LLVM")
+
+3. Select the **Release** configuration
+4. Hit the **Build Project** button or **CTRL+B** to build and run the project
+5. The project will, by default, build a shared library named `qmapboxgl.dll` that can be used with MSVC projects.
+6. If you want to build the test app, add this to the QMake command line: `CONFIG+=TestApplication`
## Demo app instructions
@@ -29,4 +40,4 @@
- Qt will select the best OpenGL implementation available automatically
- Running with ANGLE will require DirectX installed
-- Software rendenring can be forced by uncommenting this [line](https://github.com/tmpsantos/mapbox-gl-native/blob/tmpsantos-qt_windows/platform/qt/app/main.cpp#L8)
+- Software rendering can be forced by uncommenting this [line](https://github.com/tmpsantos/mapbox-gl-native/blob/tmpsantos-qt_windows/platform/qt/app/main.cpp#L8)