fix scons again for GUI cleanup, remove unused variable

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20084 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index 9e1b742875cf2e451d404fdd57b20598b595fe29..a1db5b80304e6cbf79e3072745a819f23d7c95f8 100644 (file)
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -427,11 +427,8 @@ if use_vc:
     CCFLAGS_required.append('/EHsc')
     if mode == 'debug':
         CCFLAGS_default.extend(['/wd4819', '/wd4996', '/nologo', '/MDd'])
-        # the flags are also needed in C mode (for intl lib)
-        C_CCFLAGS.extend(['/wd4819', '/wd4996', '/nologo', '/MDd'])
     else:
         CCFLAGS_default.extend(['/wd4819', '/wd4996', '/nologo', '/MD'])
-        C_CCFLAGS.extend(['/wd4819', '/wd4996', '/nologo', '/MD'])
 
 # for debug/release mode
 if env.has_key('optimization') and env['optimization'] is not None:

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index 5d25a1d58f7df8a6a1944e5197914d9302ead9fb..2523f02842d9a2a69b35b84fe0f5056e50fb6a98 100644 (file)
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -861,7 +861,6 @@ src_frontends_qt4_header_files = Split('''
     GuiCommandEdit.h
     GuiDelimiter.h
     GuiDialog.h
-    GuiDialogView.h
     GuiDocument.h
     GuiEmbeddedFiles.h
     GuiErrorList.h
@@ -946,7 +945,6 @@ src_frontends_qt4_files = Split('''
     GuiCommandEdit.cpp
     GuiDelimiter.cpp
     GuiDialog.cpp
-    GuiDialogView.cpp
     GuiDocument.cpp
     GuiEmbeddedFiles.cpp
     GuiErrorList.cpp