Merge pull request #455 from tribal-tec/master

Fix MSVC build
Eyescale · Jun 18, 2015 · 4142abf · 4142abf
2 parents d99988b + 4674261
commit 4142abf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/CMake/UseGnuWin32.cmake b/CMake/UseGnuWin32.cmake
@@ -1,13 +1,13 @@
 # Copyright (c) 2010 Daniel Pfeifer <daniel@pfeifer-mail.de>
 
 set(GNUWIN32_NAME GnuWin32)
-set(GNUWIN32_TGZ ${CMAKE_SOURCE_DIR}/CMake/${GNUWIN32_NAME}.tar.gz)
-set(GNUWIN32_DIR ${CMAKE_BINARY_DIR}/${GNUWIN32_NAME})
+set(GNUWIN32_TGZ ${PROJECT_SOURCE_DIR}/CMake/${GNUWIN32_NAME}.tar.gz)
+set(GNUWIN32_DIR ${PROJECT_BINARY_DIR}/${GNUWIN32_NAME})
 
 if(NOT EXISTS ${GNUWIN32_DIR})
   message(STATUS "  Extracting GnuWin32 to ${GNUWIN32_DIR}")
   execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf
-    ${GNUWIN32_TGZ} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+    ${GNUWIN32_TGZ} WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
 endif(NOT EXISTS ${GNUWIN32_DIR})
 
 file(WRITE ${OUTPUT_INCLUDE_DIR}/unistd.h "\n")

diff --git a/eq/qt/shareContextWindow.h b/eq/qt/shareContextWindow.h
@@ -53,7 +53,7 @@ class ShareContextWindow : public eq::SystemWindow
 
     bool configInit() final { LBUNIMPLEMENTED; return false; }
     void configExit() final { LBUNIMPLEMENTED }
-    void makeCurrent( bool ) const final { LBUNIMPLEMENTED }
+    void makeCurrent( const bool ) const final { LBUNIMPLEMENTED }
     void bindFrameBuffer() const final { LBUNIMPLEMENTED }
     void bindDrawFrameBuffer() const final { LBUNIMPLEMENTED }
     void updateFrameBuffer() const final { LBUNIMPLEMENTED }

diff --git a/eq/qt/window.cpp b/eq/qt/window.cpp
@@ -125,7 +125,7 @@ class Window
 
     virtual ~Window() {}
     virtual QOpenGLContext* getContext() const = 0;
-    virtual void makeCurrent( bool cache ) = 0;
+    virtual void makeCurrent( const bool cache ) = 0;
     virtual void doneCurrent() = 0;
     virtual void swapBuffers() = 0;
     virtual bool configInit( eq::qt::Window& window ) = 0;
@@ -364,10 +364,9 @@ Window* _createWindow( WindowIF& parent,
 {
     const int32_t drawable =
         settings.getIAttribute( WindowSettings::IATTR_HINT_DRAWABLE );
-    if( drawable == eq::PBUFFER or drawable == eq::FBO )
+    if( drawable == eq::PBUFFER || drawable == eq::FBO )
         return new QOffscreenSurfaceWrapper( parent, settings, sharedContext );
-    else
-        return new QWindowWrapper( parent, settings, sharedContext );
+    return new QWindowWrapper( parent, settings, sharedContext );
 }
 }