[med-svn] [ugene] 09/10: revert patch in source

[Gert Wollny]

This is an automated email from the git hooks/post-receive script.

gert-guest pushed a commit to branch master
in repository ugene.

commit dc123f02f671111c8623324ad15f51434bceb308
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Thu Dec 10 12:35:25 2015 +0100

    revert patch in source
---
 src/ugene_globals.pri | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/ugene_globals.pri b/src/ugene_globals.pri
index b6e33e3..0b7a43b 100644
--- a/src/ugene_globals.pri
+++ b/src/ugene_globals.pri
@@ -14,14 +14,20 @@ DEFINES+=UGENE_VER_PATCH=$${UGENE_VER_PATCH}
 _UGENE_NGS = $$(UGENE_NGS)
 contains(_UGENE_NGS, 1) : DEFINES += UGENE_NGS
 
-CFLAGS += $(CFLAGS)
-CXXFLAGS += $(CXXFLAGS)
-LDFLAGS += $(LDFLAGS)
-CPPFLAGS:=$(CPPFLAGS)
-
-QMAKE_CXXFLAGS += $$(CXXFLAGS)
-QMAKE_CFLAGS += $$(CFLAGS)
-QMAKE_LFLAGS += $$(LDFLAGS)
+#win32 : CONFIG -= flat  #group the files within the source/header group depending on the directory they reside in file system
+win32 : QMAKE_CXXFLAGS += /MP # use parallel build with nmake
+win32 : DEFINES+= _WINDOWS
+win32-msvc2013 : DEFINES += _SCL_SECURE_NO_WARNINGS
+
+win32 : QMAKE_CFLAGS_RELEASE = -O2 -Oy- -MD -Zi
+win32 : QMAKE_CXXFLAGS_RELEASE = -O2 -Oy- -MD -Zi
+win32 : QMAKE_LFLAGS_RELEASE = /INCREMENTAL:NO /MAP /MAPINFO:EXPORTS /DEBUG
+
+macx {
+    CONFIG -= warn_on
+    #Ignore "'weak_import' attribute ignored" warning coming from OpenCL headers
+    QMAKE_CXXFLAGS += -Wall -Wno-ignored-attributes
+}
 
 isEmpty( INSTALL_PREFIX )  : INSTALL_PREFIX  = /usr
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ugene.git