comparison tango/lib/compiler/llvmdc/dmain2.d @ 402:56a1c1c52142

Removed unneeded references to _minit on Windows which breaks linking. _minit is an artifact of DMD on Win32.
author Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
date Sun, 27 Jul 2008 13:46:28 +0200
parents 44a95ac7368a
children 8d62834490d8
comparison
equal deleted inserted replaced
400:e6e972c5cc17 402:56a1c1c52142
21 { 21 {
22 extern (Windows) void* LocalFree(void*); 22 extern (Windows) void* LocalFree(void*);
23 extern (Windows) wchar_t* GetCommandLineW(); 23 extern (Windows) wchar_t* GetCommandLineW();
24 extern (Windows) wchar_t** CommandLineToArgvW(wchar_t*, int*); 24 extern (Windows) wchar_t** CommandLineToArgvW(wchar_t*, int*);
25 extern (Windows) export int WideCharToMultiByte(uint, uint, wchar_t*, int, char*, int, char*, int); 25 extern (Windows) export int WideCharToMultiByte(uint, uint, wchar_t*, int, char*, int, char*, int);
26 pragma(lib, "shell32.lib"); // needed for CommandLineToArgvW 26 //pragma(lib, "shell32.lib"); // needed for CommandLineToArgvW
27 pragma(lib, "tango-win32-dmd.lib"); // links Tango's Win32 library to reduce EXE size 27 //pragma(lib, "tango-win32-dmd.lib"); // links Tango's Win32 library to reduce EXE size
28 } 28 }
29 29
30 extern (C) void _STI_monitor_staticctor(); 30 extern (C) void _STI_monitor_staticctor();
31 extern (C) void _STD_monitor_staticdtor(); 31 extern (C) void _STD_monitor_staticdtor();
32 extern (C) void _STI_critical_init(); 32 extern (C) void _STI_critical_init();
33 extern (C) void _STD_critical_term(); 33 extern (C) void _STD_critical_term();
34 extern (C) void gc_init(); 34 extern (C) void gc_init();
35 extern (C) void gc_term(); 35 extern (C) void gc_term();
36 extern (C) void _minit();
37 extern (C) void _moduleCtor(); 36 extern (C) void _moduleCtor();
38 extern (C) void _moduleDtor(); 37 extern (C) void _moduleDtor();
39 extern (C) void thread_joinAll(); 38 extern (C) void thread_joinAll();
40 39
41 //debug=PRINTF; 40 //debug=PRINTF;
100 _d_criticalInit(); 99 _d_criticalInit();
101 100
102 try 101 try
103 { 102 {
104 gc_init(); 103 gc_init();
105 version (Win32)
106 _minit();
107 _moduleCtor(); 104 _moduleCtor();
108 return true; 105 return true;
109 } 106 }
110 catch( Exception e ) 107 catch( Exception e )
111 { 108 {
278 275
279 void runAll() 276 void runAll()
280 { 277 {
281 debug(PRINTF) printf("main runAll\n"); 278 debug(PRINTF) printf("main runAll\n");
282 gc_init(); 279 gc_init();
283 version (Win32)
284 _minit();
285 _moduleCtor(); 280 _moduleCtor();
286 if (runModuleUnitTests()) 281 if (runModuleUnitTests())
287 tryExec(&runMain); 282 tryExec(&runMain);
288 thread_joinAll(); 283 thread_joinAll();
289 _d_isHalting = true; 284 _d_isHalting = true;