From 54faeae13e25fbded71a36a37c8c705f0abcf360 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Fri, 24 Jan 2014 09:51:06 -0800 Subject: [PATCH 1/2] fix windows builds --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e0a03036ff..a583d7d951 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,11 +31,11 @@ ENDIF(APPLE) # targets not supported on windows if (NOT WIN32) add_subdirectory(animation-server) +add_subdirectory(data-server) endif (NOT WIN32) # targets on all platforms add_subdirectory(assignment-client) -add_subdirectory(data-server) add_subdirectory(domain-server) add_subdirectory(interface) add_subdirectory(pairing-server) From 692358bf6ef258078e4feb4ccbf6f546f71d52e8 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Fri, 24 Jan 2014 09:51:17 -0800 Subject: [PATCH 2/2] fix windows builds --- interface/src/ui/UpdateDialog.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/interface/src/ui/UpdateDialog.cpp b/interface/src/ui/UpdateDialog.cpp index deb671427f..9919cd0a7b 100644 --- a/interface/src/ui/UpdateDialog.cpp +++ b/interface/src/ui/UpdateDialog.cpp @@ -6,9 +6,8 @@ // Copyright (c) 2013, 2014 High Fidelity, Inc. All rights reserved. // +#include "Application.h" // HACK ATTACK WARNING: for windows build to work, we need this ahead of QtGui #include - -#include "Application.h" #include "ui_updateDialog.h" #include "UpdateDialog.h"