Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-16 17:40:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #1682 from ZappoMan/master

Browse source 
Fix Windows Build
This commit is contained in:
ZappoMan 2014-01-24 10:07:50 -08:00
commit dbde1a29fe
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -31,11 +31,11 @@ ENDIF(APPLE)
# targets not supported on windows # targets not supported on windows
if (NOT WIN32) if (NOT WIN32)
add_subdirectory(animation-server) add_subdirectory(animation-server)
add_subdirectory(data-server)
endif (NOT WIN32) endif (NOT WIN32)
# targets on all platforms # targets on all platforms
add_subdirectory(assignment-client) add_subdirectory(assignment-client)
add_subdirectory(data-server)
add_subdirectory(domain-server) add_subdirectory(domain-server)
add_subdirectory(interface) add_subdirectory(interface)
add_subdirectory(pairing-server) add_subdirectory(pairing-server)

3
interface/src/ui/UpdateDialog.cpp
View file

@ -6,9 +6,8 @@
// Copyright (c) 2013, 2014 High Fidelity, Inc. All rights reserved. // 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 <QtGui> #include <QtGui>
#include "Application.h"
#include "ui_updateDialog.h" #include "ui_updateDialog.h"
#include "UpdateDialog.h" #include "UpdateDialog.h"