From 3052266a409b283ad896ee4761752e07f5199d45 Mon Sep 17 00:00:00 2001 From: Alexander Medvednikov Date: Sat, 9 May 2020 20:31:50 +0200 Subject: [PATCH] live: make compile; pref: allow _linux.v etc --- vlib/live/common.v | 2 +- vlib/v/pref/should_compile.v | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vlib/live/common.v b/vlib/live/common.v index 9705f80448..7eaa585134 100644 --- a/vlib/live/common.v +++ b/vlib/live/common.v @@ -13,7 +13,7 @@ pub: live_linkfn FNLinkLiveSymbols // generated C callback; receives a dlopen handle so_extension string // .so or .dll so_name_template string // a sprintf template for the shared libraries location -mut: +pub mut: live_lib voidptr // the result of dl.open reloads int // how many times a reloading was tried reloads_ok int // how many times the reloads succeeded diff --git a/vlib/v/pref/should_compile.v b/vlib/v/pref/should_compile.v index 3233d50621..198058ecd6 100644 --- a/vlib/v/pref/should_compile.v +++ b/vlib/v/pref/should_compile.v @@ -41,13 +41,13 @@ pub fn (prefs &Preferences) should_compile_c(file string) bool { // Probably something like `a.js.v`. return false } - if file.ends_with('_windows.c.v') && prefs.os != .windows { + if (file.ends_with('_windows.c.v') || file.ends_with('_windows.v')) && prefs.os != .windows { return false } - if file.ends_with('_linux.c.v') && prefs.os != .linux { + if (file.ends_with('_linux.c.v') || file.ends_with('_linux.v')) && prefs.os != .linux { return false } - if file.ends_with('_darwin.c.v') && prefs.os != .mac { + if (file.ends_with('_darwin.c.v') || file.ends_with('_darwin.v')) && prefs.os != .mac { return false } if file.ends_with('_nix.c.v') && prefs.os == .windows {