|
diff --git a/build/build_win.ninja.template b/build/build_win.ninja.template |
|
index 3edfb6a4..0f8cb372 100644 |
|
--- a/build/build_win.ninja.template |
|
+++ b/build/build_win.ninja.template |
|
@@ -1,12 +1,12 @@ |
|
rule cc |
|
- command = ninja -t msvc -- $cc /nologo /showIncludes /FC @${out}.rsp /c ${in} /Fo${out} |
|
+ command = ninja -t msvc -- $cc /nologo /showIncludes /FC @${out}.rsp /c ${in} /Fo${out} /source-charset:utf-8 /execution-charset:utf-8 |
|
description = CC ${out} |
|
rspfile = ${out}.rsp |
|
rspfile_content = ${defines} ${includes} ${cflags} ${cflags_c} |
|
deps = msvc |
|
|
|
rule cxx |
|
- command = ninja -t msvc -- $cxx /nologo /showIncludes /FC @${out}.rsp /c ${in} /Fo${out} |
|
+ command = ninja -t msvc -- $cxx /nologo /showIncludes /FC @${out}.rsp /c ${in} /Fo${out} /source-charset:utf-8 /execution-charset:utf-8 |
|
description = CXX ${out} |
|
rspfile = ${out}.rsp |
|
rspfile_content = ${defines} ${includes} ${cflags} ${cflags_cc} |
|
@@ -19,7 +19,7 @@ rule alink_thin |
|
rspfile_content = ${in_newline} ${libflags} |
|
|
|
rule link |
|
- command = ninja -t msvc -- $ld /nologo /OUT:${out} /PDB:${out}.pdb @${out}.rsp |
|
+ command = ninja -t msvc -- $ld /nologo /OUT:${out} /PDB:${out}.pdb @${out}.rsp /MACHINE:x86 |
|
description = LINK ${out} |
|
rspfile = ${out}.rsp |
|
rspfile_content = ${in_newline} ${libs} ${solibs} ${ldflags} |
|
diff --git a/build/gen.py b/build/gen.py |
|
index eeb7cb55..b473687c 100755 |
|
--- a/build/gen.py |
|
+++ b/build/gen.py |
|
@@ -274,7 +274,9 @@ def WriteGNNinja(path, platform, host, options): |
|
cflags_cc = os.environ.get('CXXFLAGS', '').split() |
|
ldflags = os.environ.get('LDFLAGS', '').split() |
|
libflags = os.environ.get('LIBFLAGS', '').split() |
|
+ #include_dirs = [REPO_ROOT, os.path.abspath(os.path.dirname(path))] or you can python gen.py --out-path=ABS_PATH |
|
include_dirs = [REPO_ROOT, os.path.dirname(path)] |
|
+ |
|
libs = [] |
|
|
|
if not platform.is_msvc(): |