On Wed, 05 Jun 2013 19:56:39 +0200
Enrico Tröger <enrico.troe...@uvena.de> wrote:
> > system, and Geany fails to build. Speaking of which, it'll be a good
> > idea to change the C++ compiler detection as well - I don't think a mix
> > of gcc-compiled Geany sources and msvc-compiled Scintilla will work.
>
> True. We should do this. Do you volunteer as you seem to have a system
> with both compilers installed and so you can test this best? :)
Here. Tested with 1.23.1 (not git), but that's a 1-liner and can't be™
any different.
> just to save you some trouble:
> before compiling, look at
> https://sourceforge.net/p/scintilla/code/ci/e806db1e88ea1762815760af704cc414ae395f00/
> which fixes compilation with older gcc versions and might be necessary,
The wonders of 21-st century C++. Thanks, my gcc seems reasonably new.
--
E-gards: Jimmy
>From fd1cb8af53b835ce1e5dfbda784777c90ff6f8cb Mon Sep 17 00:00:00 2001
From: Dimitar Zhekov <dimitar.zhe...@gmail.com>
Date: Thu, 6 Jun 2013 20:19:15 +0300
Subject: [PATCH] sync C++ compiler detection under Windows with the C
compiler detection
---
wscript | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/wscript b/wscript
index 2717c02..b9053b0 100644
--- a/wscript
+++ b/wscript
@@ -303,9 +303,10 @@ def configure(conf):
def options(opt):
- # Disable MSVC detetion on win32: building Geany with MSVC is currently not supported
+ # Disable MSVC detection on win32: building Geany with MSVC is currently not supported
# If anyone wants to add support for building with MSVC, this hack should be removed.
c_compiler['win32'] = ['gcc']
+ cxx_compiler['win32'] = ['g++']
opt.load('compiler_cc')
opt.load('compiler_cxx')
--
1.7.10.4
_______________________________________________
Devel mailing list
Devel@lists.geany.org
https://lists.geany.org/cgi-bin/mailman/listinfo/devel
