fix windows...

flax-lang · Jul 6, 2019 · aaff811 · aaff811
1 parent 09376f4
commit aaff811
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/source/main.cpp b/source/main.cpp
@@ -80,7 +80,6 @@ static void compile(std::string in, std::string out)
 
 	timer t;
 
-	platform::compiler::performSelfDlOpen();
 
 	fir::Module* module = frontend::generateFIRModule(&state, dtree);
 	module->finaliseGlobalConstructors();
@@ -157,6 +156,7 @@ static void compile(std::string in, std::string out)
 int main(int argc, char** argv)
 {
 	platform::setupTerminalIfNecessary();
+	platform::compiler::performSelfDlOpen();
 
 	auto [ input_file, output_file ] = frontend::parseCmdLineOpts(argc, argv);
 	compile(input_file, output_file);

diff --git a/source/platform/compiler.cpp b/source/platform/compiler.cpp
@@ -251,6 +251,9 @@ namespace compiler
 	{
 		#if OS_WINDOWS
 			currentModule = GetModuleHandle(nullptr);
+
+			otherModules.push_back(LoadLibrary("ucrtbase.dll"));
+			otherModules.push_back(LoadLibrary("vcruntime140.dll"));
 		#else
 			currentModule = dlopen(nullptr, RTLD_LAZY);
 		#endif