Author: robertj
Date: 2006-11-03 14:00:29 -0500 (Fri, 03 Nov 2006)
New Revision: 67317

Modified:
   trunk/mono/mono/mini/
   trunk/mono/mono/mini/ChangeLog
   trunk/mono/mono/mini/Makefile.am
   trunk/mono/mono/mini/driver.c
Log:
2006-11-03  Robert Jordan  <[EMAIL PROTECTED]>

        * Makefile.am: [WIN32] Add monow.exe target.
        * driver.c: [WIN32] Don't detach the console when debugging.
        Fixes bug #79797.
        



Property changes on: trunk/mono/mono/mini
___________________________________________________________________
Name: svn:ignore
   - Makefile
Makefile.in
*.o
*.exe
*.dll
*.lo
*.loT
*.la
.libs
.deps
mini
genmdesc
inssel.c
inssel.h
mini.pc
cpu-pentium.h
cpu-g4.h
cpu-amd64.h
mono
cpu-sparc.h
cpu-s390.h
.hidden
semantic.cache

   + Makefile
Makefile.in
*.o
*.exe
*.dll
*.lo
*.loT
*.la
.libs
.deps
mini
genmdesc
inssel.c
inssel.h
mini.pc
cpu-pentium.h
cpu-g4.h
cpu-amd64.h
mono
monow
cpu-sparc.h
cpu-s390.h
.hidden
semantic.cache


Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog      2006-11-03 17:22:28 UTC (rev 67316)
+++ trunk/mono/mono/mini/ChangeLog      2006-11-03 19:00:29 UTC (rev 67317)
@@ -1,3 +1,9 @@
+2006-11-03  Robert Jordan  <[EMAIL PROTECTED]>
+
+       * Makefile.am: [WIN32] Add monow.exe target.
+       * driver.c: [WIN32] Don't detach the console when debugging.
+       Fixes bug #79797.
+       
 2006-10-30  Miguel de Icaza  <[EMAIL PROTECTED]>
 
        * tramp-x86.c (mono_arch_patch_delegate_trampoline): Eliminate warning.

Modified: trunk/mono/mono/mini/Makefile.am
===================================================================
--- trunk/mono/mono/mini/Makefile.am    2006-11-03 17:22:28 UTC (rev 67316)
+++ trunk/mono/mono/mini/Makefile.am    2006-11-03 19:00:29 UTC (rev 67317)
@@ -70,7 +70,12 @@
 endif
 
 if JIT_SUPPORTED
+
+if PLATFORM_WIN32
+bin_PROGRAMS = mono monow
+else
 bin_PROGRAMS = mono
+endif
 
 noinst_PROGRAMS = genmdesc
 
@@ -97,6 +102,13 @@
 mono_LDFLAGS = \
        $(static_flags) -export-dynamic $(monobinldflags)
 
+# Create monow.exe, linked for the 'windows' subsystem
+if PLATFORM_WIN32
+monow_LDADD = $(mono_LDADD)
+monow_LDFLAGS = $(mono_LDFLAGS) -mwindows
+monow_SOURCES = $(mono_SOURCES)
+endif
+
 genmdesc_SOURCES = \
        mini.h          \
        genmdesc.c      \

Modified: trunk/mono/mono/mini/driver.c
===================================================================
--- trunk/mono/mono/mini/driver.c       2006-11-03 17:22:28 UTC (rev 67316)
+++ trunk/mono/mono/mini/driver.c       2006-11-03 19:00:29 UTC (rev 67317)
@@ -983,7 +983,7 @@
 
 #ifdef PLATFORM_WIN32
                /* Detach console when executing IMAGE_SUBSYSTEM_WINDOWS_GUI on 
win32 */
-               if (!mono_compile_aot && 
((MonoCLIImageInfo*)(mono_assembly_get_image 
(assembly)->image_info))->cli_header.nt.pe_subsys_required == 
IMAGE_SUBSYSTEM_WINDOWS_GUI)
+               if (!enable_debugging && !mono_compile_aot && 
((MonoCLIImageInfo*)(mono_assembly_get_image 
(assembly)->image_info))->cli_header.nt.pe_subsys_required == 
IMAGE_SUBSYSTEM_WINDOWS_GUI)
                        FreeConsole ();
 #endif
 

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to