diff --git a/Tier1/premake5.lua b/Tier1/premake5.lua index 0e2e200c404..a4b4018dfc5 100644 --- a/Tier1/premake5.lua +++ b/Tier1/premake5.lua @@ -48,13 +48,14 @@ files { "../src/tier1/utlsymbol.cpp" } -if os.is "windows" then +filter "system:windows" links { "Ws2_32", "Rpcrt4" } files "../src/tier1/processor_detect.cpp" -else +filter "system:linux" + buildoptions "-std=gnu++11" +filter "system:not windows" files { "../src/tier1/processor_detect_linux.cpp", - "../src/tier1/qsort_s.cpp", - "../src/tier1/pathmatch.cpp" + "../src/tier1/qsort_s.cpp" } -end +filter {} diff --git a/premake5.lua b/premake5.lua index 70d3174af3f..01f12a28789 100644 --- a/premake5.lua +++ b/premake5.lua @@ -5,9 +5,9 @@ local libLocations = { } local osDefinition = { - windows = { "WIN32" }, - macosx = { "POSIX", "_POSIX", "GNUC", "OSX" }, - linux = { "POSIX", "_POSIX", "LINUX", "_LINUX", "GNUC" } + windows = { "WIN32", "_DLL_EXT=dll" }, + macosx = { "POSIX", "_POSIX", "GNUC", "OSX", "_DLL_EXT=dylib", "NO_MALLOC_OVERRIDE" }, + linux = { "POSIX", "_POSIX", "LINUX", "_LINUX", "GNUC", "_DLL_EXT=so", "NO_MALLOC_OVERRIDE" } } libdirs(libLocations[os.get()])