From f7271df0e59b956efd8a8da7d932e1f1108d478b Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Mon, 4 Jan 2016 21:36:38 +0100 Subject: [PATCH] LP-30 fixed windows debug build --- ground/gcs/src/libs/osgearth/copydata.pro | 2 +- ground/gcs/src/libs/osgearth/osgearth.pro | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ground/gcs/src/libs/osgearth/copydata.pro b/ground/gcs/src/libs/osgearth/copydata.pro index bd93a4fe1..e28e3d7b9 100644 --- a/ground/gcs/src/libs/osgearth/copydata.pro +++ b/ground/gcs/src/libs/osgearth/copydata.pro @@ -36,7 +36,7 @@ equals(copyosg, 1) { win32 { # set debug suffix if needed - CONFIG(debug, debug|release):DS = "d" + #CONFIG(debug, debug|release):DS = "d" # copy osg libraries OSG_LIBS = \ diff --git a/ground/gcs/src/libs/osgearth/osgearth.pro b/ground/gcs/src/libs/osgearth/osgearth.pro index 4ee5a7dc2..a7185ada0 100644 --- a/ground/gcs/src/libs/osgearth/osgearth.pro +++ b/ground/gcs/src/libs/osgearth/osgearth.pro @@ -91,18 +91,18 @@ macx { win32 { LIBS += -L$$OSG_SDK_DIR/lib - CONFIG(release, debug|release) { + #CONFIG(release, debug|release) { LIBS += -lOpenThreads LIBS += -losg -losgUtil -losgDB -losgGA -losgViewer -losgText LIBS += -losgEarth -losgEarthUtil -losgEarthFeatures -losgEarthSymbology -losgEarthAnnotation LIBS += -losgQt -losgEarthQt - } - CONFIG(debug, debug|release) { - LIBS += -lOpenThreadsd - LIBS += -losgd -losgUtild -losgDBd -losgGAd -losgViewerd -losgTextd - LIBS += -losgEarthd -losgEarthUtild -losgEarthFeaturesd -losgEarthSymbologyd -losgEarthAnnotationd - LIBS += -losgQtd -losgEarthQtd - } + #} + #CONFIG(debug, debug|release) { + # LIBS += -lOpenThreadsd + # LIBS += -losgd -losgUtild -losgDBd -losgGAd -losgViewerd -losgTextd + # LIBS += -losgEarthd -losgEarthUtild -losgEarthFeaturesd -losgEarthSymbologyd -losgEarthAnnotationd + # LIBS += -losgQtd -losgEarthQtd + #} } include(copydata.pro)