diff --git a/premake5-deps.lua b/premake5-deps.lua index 1fe6460f..af6b3b59 100644 --- a/premake5-deps.lua +++ b/premake5-deps.lua @@ -212,13 +212,6 @@ local function cmake_build(dep_folder, is_32, extra_cmd_defs, c_flags_init, cxx_ table.insert(all_cflags_init, '-m32') table.insert(all_cxxflags_init, '-m32') end - if os.target() == 'windows' then -- MinGW on Windows - -- from docs: "specifies that the typical Microsoft Windows predefined macros are to be set in the pre-processor, - -- but does not influence the choice of runtime library/startup code" - -- optional really - table.insert(all_cflags_init, '-mwin32') - table.insert(all_cxxflags_init, '-mwin32') - end elseif string.match(_ACTION, 'vs.+') then -- these 2 are needed because mbedtls doesn't care about 'CMAKE_MSVC_RUNTIME_LIBRARY' for some reason table.insert(all_cflags_init, '-MT') diff --git a/premake5.lua b/premake5.lua index 3c02026e..43e655e5 100644 --- a/premake5.lua +++ b/premake5.lua @@ -432,16 +432,9 @@ filter {} -- reset the filter and remove all active keywords -- MinGw on Windows +-- common compiler/linker options: source: https://gcc.gnu.org/onlinedocs/gcc/Cygwin-and-MinGW-Options.html --------- filter { "system:windows", "action:gmake*", } - -- MinGw on Windows common compiler/linker options - -- source: https://gcc.gnu.org/onlinedocs/gcc/Cygwin-and-MinGW-Options.html - buildoptions { - -- from docs: "specifies that the typical Microsoft Windows predefined macros are to be set in the pre-processor, - -- but does not influence the choice of runtime library/startup code" - -- optional really - '-mwin32', - } -- MinGw on Windows common defines -- MinGw on Windows doesn't have a definition for '_S_IFDIR' which is microsoft specific: https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/stat-functions -- this is used in 'base.cpp' -> if ( buffer.st_mode & _S_IFDIR)