Add --dlpackage flag

This commit is contained in:
Jack Andersen 2017-12-26 14:51:02 -10:00
parent 053ebd41c4
commit 45245a1ffc
4 changed files with 28 additions and 15 deletions

View File

@ -69,6 +69,8 @@ elseif(UNIX)
set(PLAT_SRCS mainicon_netwm.c) set(PLAT_SRCS mainicon_netwm.c)
endif() endif()
set_source_files_properties(main.cpp PROPERTIES COMPILE_DEFINITIONS URDE_DLPACKAGE="${URDE_DLPACKAGE}")
add_executable(urde WIN32 MACOSX_BUNDLE add_executable(urde WIN32 MACOSX_BUNDLE
main.cpp ${PLAT_SRCS} main.cpp ${PLAT_SRCS}
Space.hpp Space.cpp atdna_Space.cpp Space.hpp Space.cpp atdna_Space.cpp

View File

@ -23,27 +23,32 @@ static logvisor::Module Log{"URDE"};
static hecl::SystemString CPUFeatureString(const zeus::CPUInfo& cpuInf) static hecl::SystemString CPUFeatureString(const zeus::CPUInfo& cpuInf)
{ {
hecl::SystemString features; hecl::SystemString features;
if (cpuInf.AESNI) auto AddFeature = [&features](const hecl::SystemChar* str)
features += _S("AES-NI");
if (cpuInf.SSE1)
{ {
if (!features.empty()) if (!features.empty())
features += _S(", SSE1"); features += _S(", ");
else features += str;
features += _S("SSE1"); };
} if (cpuInf.AESNI)
AddFeature(_S("AES-NI"));
if (cpuInf.SSE1)
AddFeature(_S("SSE"));
if (cpuInf.SSE2) if (cpuInf.SSE2)
features += _S(", SSE2"); AddFeature(_S("SSE2"));
if (cpuInf.SSE3) if (cpuInf.SSE3)
features += _S(", SSE3"); AddFeature(_S("SSE3"));
if (cpuInf.SSSE3) if (cpuInf.SSSE3)
features += _S(", SSSE3"); AddFeature(_S("SSSE3"));
if (cpuInf.SSE4a) if (cpuInf.SSE4a)
features += _S(", SSE4a"); AddFeature(_S("SSE4a"));
if (cpuInf.SSE41) if (cpuInf.SSE41)
features += _S(", SSE4.1"); AddFeature(_S("SSE4.1"));
if (cpuInf.SSE42) if (cpuInf.SSE42)
features += _S(", SSE4.2"); AddFeature(_S("SSE4.2"));
if (cpuInf.AVX)
AddFeature(_S("AVX"));
if (cpuInf.AVX2)
AddFeature(_S("AVX2"));
return features; return features;
} }
@ -160,6 +165,12 @@ int wmain(int argc, const boo::SystemChar** argv)
int main(int argc, const boo::SystemChar** argv) int main(int argc, const boo::SystemChar** argv)
#endif #endif
{ {
if (argc > 1 && !strcmp(argv[1], "--dlpackage"))
{
printf("%s\n", URDE_DLPACKAGE);
return 100;
}
SetupBasics(IsClientLoggingEnabled(argc, argv)); SetupBasics(IsClientLoggingEnabled(argc, argv));
if (hecl::SystemChar* cwd = hecl::Getcwd(CwdBuf, 1024)) if (hecl::SystemChar* cwd = hecl::Getcwd(CwdBuf, 1024))

@ -1 +1 @@
Subproject commit 5e802b98dcdd2485355526be8fa1aa4f3cfa5ca7 Subproject commit 467a3996abbb56672c413cddf1c07f8e20f9c9be

@ -1 +1 @@
Subproject commit 1100f55788199d353e7310ed4427a655c7965255 Subproject commit f5049df11e37fafadbccde5c946fa07377ed375a