Generate separate winrt projects.

Author: Sibras

include/configGenerator.h

@@ -61,7 +61,6 @@ class ConfigGenerator
     ValuesList m_configValues;
     uint m_configValuesEnd{};
     string m_configureFile;
-    string m_toolchain;
     bool m_isLibav{false};
     string m_projectName;
     string m_rootDirectory;

include/projectGenerator.h

@@ -237,17 +237,16 @@ class ProjectGenerator
 
     void buildInterDependencies(StaticList& libs);
 
-    void buildDependencies(StaticList& libs, StaticList& addLibs);
-
     /**
-     * Updates existing library dependency lists by adding/removing those required/unavailable by WinRT.
+     * Gets library dependency lists.
      * @param [in,out] libs    The project dependency libs.
      * @param [in,out] addLibs The windows dependency libs.
+     * @param          winrt   True if checking for winrt.
      */
-    void buildDependenciesWinRT(StaticList& libs, StaticList& addLibs);
+    void buildDependencies(StaticList& libs, StaticList& addLibs, bool winrt);
 
     void buildDependencyValues(StaticList& includeDirs, StaticList& lib32Dirs, StaticList& lib64Dirs,
-        StaticList& definesShared, StaticList& definesStatic) const;
+        StaticList& definesShared, StaticList& definesStatic, bool winrt) const;
 
     void buildProjectDependencies(map<string, bool>& projectDeps) const;
 
@@ -278,7 +277,7 @@ class ProjectGenerator
     bool findProjectFiles(const StaticList& includes, StaticList& includesC, StaticList& includesCPP,
         StaticList& includesASM, StaticList& includesH, StaticList& includesCU) const;
 
-    void outputTemplateTags(string& projectTemplate, string& filtersTemplate) const;
+    void outputTemplateTags(string& projectTemplate) const;
 
     void outputSourceFileType(StaticList& fileList, const string& type, const string& filterType,
         string& projectTemplate, string& filterTemplate, StaticList& foundObjects, set<string>& foundFilters,
@@ -365,19 +364,7 @@ class ProjectGenerator
      */
     void outputCUDATools(string& projectTemplate) const;
 
-    bool outputDependencyLibs(string& projectTemplate, bool program = false);
-
-    /**
-     * Removes any WinRT/UWP configurations from the output project template.
-     * @param [in,out] projectTemplate The project template.
-     */
-    static void outputStripWinRT(string& projectTemplate);
-
-    /**
-     * Removes any WinRT/UWP configurations from the output solution template.
-     * @param [in,out] solutionFile The solution template.
-     */
-    static void outputStripWinRTSolution(string& solutionFile);
+    bool outputDependencyLibs(string& projectTemplate, bool winrt, bool program);
 
     /**
      * Search through files in the current project and finds any undefined elements that are used in DCE blocks. A new

source/Templates.rc

@@ -24,15 +24,7 @@
 #include <regex>
 
 ConfigGenerator::ConfigGenerator()
-    :
-#ifdef _MSC_VER
-    m_toolchain("msvc")
-#elif defined(_WIN32)
-    m_toolchain("mingw")
-#else
-    m_toolchain("gcc")
-#endif
-    , m_projectName("FFMPEG")
+    : m_projectName("FFMPEG")
 {}
 
 bool ConfigGenerator::passConfig(const int argc, char** argv)
@@ -345,7 +337,7 @@ bool ConfigGenerator::changeConfig(const string& option)
         outputLine(helpOptions);
         // Add in custom standard string
         outputLine("Standard options:");
-        outputLine("  --prefix=PREFIX          install in PREFIX [../../../msvc/]");
+        // outputLine("  --prefix=PREFIX          install in PREFIX [../../../msvc/]");
         // outputLine("  --bindir=DIR             install binaries in DIR [PREFIX/bin]");
         // outputLine("  --libdir=DIR             install libs in DIR [PREFIX/lib]");
         // outputLine("  --incdir=DIR             install includes in DIR [PREFIX/include]");
@@ -355,7 +347,6 @@ bool ConfigGenerator::changeConfig(const string& option)
             "  --use-existing-config    use an existing config.h file found in rootdir, ignoring any other passed parameters affecting config");
         // Add in custom toolchain string
         outputLine("Toolchain options:");
-        outputLine("  --toolchain=NAME         set tool defaults according to NAME");
         outputLine("  --dce-only               do not output a project and only generate missing DCE files");
         outputLine(
             "  --use-yasm               use YASM instead of the default NASM (this is not advised as it does not support newer instructions)");
@@ -368,63 +359,7 @@ bool ConfigGenerator::changeConfig(const string& option)
         }
         return false;
     }
-    if (option.find("--toolchain") == 0) {
-        // Check for correct command syntax
-        if (option.at(11) != '=') {
-            outputError("Incorrect toolchain syntax (" + option + ")");
-            outputError("Excepted syntax (--toolchain=NAME)", false);
-            return false;
-        }
-        // A tool chain has been specified
-        string toolChain = option.substr(12);
-        if (toolChain == "msvc") {
-            // Don't disable inline as the configure header will auto header guard it out anyway. This allows for
-            // changing on the fly afterwards
-        } else if (toolChain == "icl") {
-            // Inline asm by default is turned on if icl is detected
-        } else {
-#ifdef _MSC_VER
-            // Only support msvc when built with msvc
-            outputError("Unknown toolchain option (" + toolChain + ")");
-            outputError("Excepted toolchains (msvc, icl)", false);
-            return false;
-#else
-            // Only support other toolchains if DCE only
-            if (!m_onlyDCE) {
-                outputError("Unknown toolchain option (" + sToolChain + ")");
-                outputError("Other toolchains are only supported if --dce-only has already been specified.", false);
-                return false;
-            } else {
-                if ((toolChain.find("mingw") == string::npos) && (toolChain.find("gcc") == string::npos)) {
-                    outputError("Unknown toolchain option (" + toolChain + ")");
-                    outputError("Excepted toolchains (mingw*, gcc*)", false);
-                    return false;
-                }
-            }
-#endif
-        }
-        m_toolchain = toolChain;
-    } else if (option.find("--prefix") == 0) {
-        // Check for correct command syntax
-        if (option.at(8) != '=') {
-            outputError("Incorrect prefix syntax (" + option + ")");
-            outputError("Excepted syntax (--prefix=PREFIX)", false);
-            return false;
-        }
-        // A output dir has been specified
-        string value = option.substr(9);
-        m_outDirectory = value;
-        // Convert '\' to '/'
-        replace(m_outDirectory.begin(), m_outDirectory.end(), '\\', '/');
-        // Check if a directory has been passed
-        if (m_outDirectory.length() == 0) {
-            m_outDirectory = "./";
-        }
-        // Check if directory has trailing '/'
-        if (m_outDirectory.back() != '/') {
-            m_outDirectory += '/';
-        }
-    } else if (option.find("--rootdir") == 0) {
+    if (option.find("--rootdir") == 0) {
         // Check for correct command syntax
         if (option.at(9) != '=') {
             outputError("Incorrect rootdir syntax (" + option + ")");
@@ -516,7 +451,7 @@ bool ConfigGenerator::changeConfig(const string& option)
             // Find remainder of option
             option2 = option.substr(10);
         } else {
-            outputError("Unknown command line option (" + option2 + ")");
+            outputError("Unknown command line option (" + option + ")");
             outputError("Use --help to get available options", false);
             return false;
         }

source/configGenerator.cpp

@@ -229,12 +229,12 @@ bool ConfigGenerator::buildDefaultValues()
     fastToggleConfigValue("struct_pollfd", true);
     fastToggleConfigValue("struct_sockaddr_in6", true);
     fastToggleConfigValue("struct_sockaddr_storage", true);
-    fastToggleConfigValue("unistd_h", true);
-    fastToggleConfigValue("uwp", false);
+    fastToggleConfigValue("unistd_h", false);
+    fastToggleConfigValue("uwp", true);
     fastToggleConfigValue("VirtualAlloc", true);
     fastToggleConfigValue("windows_h", true);
     fastToggleConfigValue("winsock2_h", true);
-    fastToggleConfigValue("winrt", false);
+    fastToggleConfigValue("winrt", true);
     fastToggleConfigValue("wglgetprocaddress", true);
 
     fastToggleConfigValue("aligned_stack", true);
@@ -951,8 +951,8 @@ void ConfigGenerator::buildReservedValues(vector<string>& reservedItems)
     reservedItems.emplace_back("small");
     reservedItems.emplace_back("lto");
     reservedItems.emplace_back("pic");
-    // reservedItems.emplace_back("uwp");
-    // reservedItems.emplace_back("winrt");
+    reservedItems.emplace_back("uwp");
+    reservedItems.emplace_back("winrt");
 }
 
 void ConfigGenerator::buildAdditionalDependencies(DependencyList& additionalDependencies)

source/configGenerator_build.cpp

@@ -31,31 +31,34 @@
 #    include <Windows.h>
 #else
 #    include <dirent.h>
-extern char _binary_compat_h_start[];
-extern char _binary_compat_h_end[];
-extern char _binary_math_h_start[];
-extern char _binary_math_h_end[];
-extern char _binary_unistd_h_start[];
-extern char _binary_unistd_h_end[];
-extern char _binary_template_in_sln_start[];
-extern char _binary_template_in_sln_end[];
-extern char _binary_template_in_vcxproj_start[];
-extern char _binary_template_in_vcxproj_end[];
-extern char _binary_template_in_vcxproj_filters_start[];
-extern char _binary_template_in_vcxproj_filters_end[];
-extern char _binary_templateprogram_in_vcxproj_start[];
-extern char _binary_templateprogram_in_vcxproj_end[];
-extern char _binary_templateprogram_in_vcxproj_filters_start[];
-extern char _binary_templateprogram_in_vcxproj_filters_end[];
-extern char _binary_stdatomic_h_start[];
-extern char _binary_stdatomic_h_end[];
-const char* pp_cStartArray[] = {_binary_compat_h_start, _binary_math_h_start, _binary_unistd_h_start,
-    _binary_template_in_sln_start, _binary_template_in_vcxproj_start, _binary_template_in_vcxproj_filters_start,
-    _binary_templateprogram_in_vcxproj_start, _binary_templateprogram_in_vcxproj_filters_start,
-    _binary_stdatomic_h_start};
-const char* pp_cEndArray[] = {_binary_compat_h_end, _binary_math_h_end, _binary_unistd_h_end,
-    _binary_template_in_sln_end, _binary_template_in_vcxproj_end, _binary_template_in_vcxproj_filters_end,
-    _binary_templateprogram_in_vcxproj_end, _binary_templateprogram_in_vcxproj_filters_end, _binary_stdatomic_h_end};
+extern char _binary_template_sln_start[];
+extern char _binary_template_sln_end[];
+extern char _binary_template_vcxproj_start[];
+extern char _binary_template_vcxproj_end[];
+extern char _binary_template_vcxproj_filters_start[];
+extern char _binary_template_vcxproj_filters_end[];
+extern char _binary_template_program_vcxproj_start[];
+extern char _binary_template_program_vcxproj_end[];
+extern char _binary_template_program_vcxproj_filters_start[];
+extern char _binary_template_program_vcxproj_filters_end[];
+extern char _binary_template_bat_start[];
+extern char _binary_template_bat_end[];
+extern char _binary_template_vcxproj_winrt_start[];
+extern char _binary_template_vcxproj_winrt_end[];
+extern char _binary_template_props_start[];
+extern char _binary_template_props_end[];
+extern char _binary_template_props_winrt_start[];
+extern char _binary_template_props_winrt_end[];
+extern char _binary_template_file_props_start[];
+extern char _binary_template_file_props_end[];
+const char* pp_cStartArray[] = {_binary_template_sln_start, _binary_template_vcxproj_start,
+    _binary_template_vcxproj_filters_start, _binary_template_program_vcxproj_start,
+    _binary_template_program_vcxproj_filters_start, _binary_template_bat_start, _binary_template_vcxproj_winrt_start,
+    _binary_template_props_start, _binary_template_props_winrt_start, _binary_template_file_props_start};
+const char* pp_cEndArray[] = {_binary_template_sln_end, _binary_template_vcxproj_end,
+    _binary_template_vcxproj_filters_end, _binary_template_program_vcxproj_end,
+    _binary_template_program_vcxproj_filters_end, _binary_template_bat_end, _binary_template_vcxproj_winrt_end,
+    _binary_template_props_end, _binary_template_props_winrt_end, _binary_template_file_props_end};
 #endif
 
 #if _DEBUG