use 'hasEnv' for env value checks

src/android/window.cc

@@ -21,6 +21,11 @@ namespace SSC::android {
 
     for (auto const &var : parseStringList(this->config["build_env"])) {
       auto key = trim(var);
+
+      if (!hasEnv(key)) {
+        continue;
+      }
+
       auto value = getEnv(key.c_str());
 
       if (value.size() > 0) {

src/cli/cli.cc

@@ -1655,8 +1655,8 @@ int main (const int argc, const char* argv[]) {
             auto parts = split(value, '=');
             if (parts.size() == 2) {
               stream << parts[0] << " = " << parts[1] << "\n";
-            } else if (parts.size() == 1) {
-              stream << parts[0] << " = " << getEnv(parts[0].c_str()) << "\n";
+            } else if (parts.size() == 1 && hasEnv(parts[0])) {
+              stream << parts[0] << " = " << getEnv(parts[0]) << "\n";
             }
           }
 
@@ -4553,14 +4553,16 @@ int main (const int argc, const char* argv[]) {
                 compilerFlags += " -stdlib=libstdc++";
               }
 
-              if (CXX.ends_with("clang++")) {
-                compiler = CXX.substr(0, CXX.size() - 2);
-              } else if (CXX.ends_with("clang++.exe")) {
-                compiler = CXX.substr(0, CXX.size() - 6) + ".exe";
-              } else if (CXX.ends_with("g++")) {
-                compiler = CXX.substr(0, CXX.size() - 2) + "cc";
-              } else if (CXX.ends_with("g++.exe")) {
-                compiler = CXX.substr(0, CXX.size() - 6) + "cc.exe";
+              if (CXX.size() == 0) {
+                if (compiler.ends_with("clang++")) {
+                  compiler = compiler.substr(0, compiler.size() - 2);
+                } else if (compiler.ends_with("clang++.exe")) {
+                  compiler = compiler.substr(0, compiler.size() - 6) + ".exe";
+                } else if (compiler.ends_with("g++")) {
+                  compiler = compiler.substr(0, compiler.size() - 2) + "cc";
+                } else if (compiler.ends_with("g++.exe")) {
+                  compiler = compiler.substr(0, compiler.size() - 6) + "cc.exe";
+                }
               }
             } else if (source.ends_with(".o") || source.ends_with(".a")) {
               objects << source << " ";

src/common.hh

@@ -573,6 +573,43 @@ namespace SSC {
     return r;
   }
 
+  inline bool hasEnv (const char* variableName) {
+    static auto appData = getUserConfig();
+
+    if (appData[String("env_") + variableName].size() > 0) {
+      return true;
+    }
+
+  #if defined(_WIN32)
+    char* value = nullptr;
+    size_t size = 0;
+    auto result = _dupenv_s(&value, &size, variableName);
+
+    if (value && value[0] == '\0') {
+      free(value);
+      return false;
+    }
+
+    free(value);
+
+    if (size == 0 || result != 0) {
+      return false;
+    }
+  #else
+    auto value = getenv(variableName);
+
+    if (value == nullptr || value[0] == '\0') {
+      return false;
+    }
+  #endif
+
+    return true;
+  }
+
+  inline bool hasEnv (const String& variableName) {
+    return hasEnv(variableName.c_str());
+  }
+
   inline String getEnv (const char* variableName) {
     static auto appData = getUserConfig();
 

src/desktop/main.cc

@@ -179,6 +179,11 @@ MAIN {
   SSC::StringStream env;
   for (auto const &envKey : parseStringList(app.appData["build_env"])) {
     auto cleanKey = trim(envKey);
+
+    if (!hasEnv(cleanKey)) {
+      continue;
+    }
+
     auto envValue = getEnv(cleanKey.c_str());
 
     env << SSC::String(

src/ios/main.mm

@@ -201,6 +201,11 @@ -           (BOOL) application: (UIApplication*) application
 
   for (auto const &envKey : parseStringList(appData["build_env"])) {
     auto cleanKey = trim(envKey);
+
+    if (!hasEnv(cleanKey)) {
+      continue;
+    }
+
     auto envValue = getEnv(cleanKey.c_str());
 
     env << String(

src/window/window.hh

@@ -445,6 +445,11 @@ namespace SSC {
         if (opts.appData.size() > 0) {
           for (auto const &envKey : parseStringList(opts.appData["build_env"])) {
             auto cleanKey = trim(envKey);
+
+            if (!hasEnv(cleanKey)) {
+              continue;
+            }
+
             auto envValue = getEnv(cleanKey.c_str());
 
             env << String(
@@ -454,6 +459,11 @@ namespace SSC {
         } else {
           for (auto const &envKey : parseStringList(this->options.appData["build_env"])) {
             auto cleanKey = trim(envKey);
+
+            if (!hasEnv(cleanKey)) {
+              continue;
+            }
+
             auto envValue = getEnv(cleanKey.c_str());
 
             env << String(