mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

pref: fix cross-compiling graphical apps to Windows (#7449)

Browse Source
This commit is contained in:
spaceface
2020-12-21 18:45:12 +01:00
committed by GitHub
parent dc3a6bb169
commit c544cc508b
4 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
vlib/v/builder/cc.v
View File

@@ -703,6 +703,9 @@ fn (mut v Builder) cc() {
}
fn (mut b Builder) cc_linux_cross() {
b.setup_ccompiler_options(b.pref.ccompiler)
b.build_thirdparty_obj_files()
b.setup_output_name()
parent_dir := os.vmodules_dir()
if !os.exists(parent_dir) {
os.mkdir(parent_dir)
@@ -763,6 +766,9 @@ fn (mut b Builder) cc_linux_cross() {
fn (mut c Builder) cc_windows_cross() {
println('Cross compiling for Windows...')
c.setup_ccompiler_options(c.pref.ccompiler)
c.build_thirdparty_obj_files()
c.setup_output_name()
if !c.pref.out_name.ends_with('.exe') {
c.pref.out_name += '.exe'
}
@@ -865,12 +871,6 @@ fn (mut v Builder) build_thirdparty_obj_files() {
fn (mut v Builder) build_thirdparty_obj_file(path string, moduleflags []cflag.CFlag) {
obj_path := os.real_path(path)
if v.pref.os == .windows {
// Cross compiling for Windows
$if !windows {
v.pref.ccompiler = mingw_cc
}
}
cfile := '${obj_path[..obj_path.len - 2]}.c'
btarget := moduleflags.c_options_before_target()
atarget := moduleflags.c_options_after_target()