Changeset: e6a76a9ce6bb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e6a76a9ce6bb
Modified Files:
buildtools/autogen/autogen/msc.py
Branch: default
Log Message:
Only include needed object files in executables.
On Windows, we need to do something special to get all object files in
a "NOINST" library into the shared libraries that we create. However,
we don't need to include all those "NOINST" object files into
executables that we create, but only those that are actually used. So
don't use wincompile.py for executables, only for shared libraries.
diffs (25 lines):
diff -r 83f5b8bf06c5 -r e6a76a9ce6bb buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py Fri Jan 14 17:48:54 2011 +0100
+++ b/buildtools/autogen/autogen/msc.py Fri Jan 14 18:16:33 2011 +0100
@@ -655,8 +655,8 @@
SCRIPTS.append(target)
fd.write(srcs + "\n")
fd.write("%s.exe: $(%s_OBJS)\n" % (binname, binname2))
- fd.write('\t"$(TOPDIR)\\..\\NT\\wincompile.py" $(CC) $(CFLAGS)')
- fd.write(" -Fe%s.exe $(%s_OBJS) /link @<<\n$(%s_LIBS) /subsystem:console
/NODEFAULTLIB:LIBC\n<<\n" % (binname, binname2, binname2))
+ fd.write('\t$(CC) $(CFLAGS)')
+ fd.write(" -Fe%s.exe $(%s_OBJS) /link $(%s_LIBS) /subsystem:console
/NODEFAULTLIB:LIBC\n" % (binname, binname2, binname2))
fd.write("\t$(EDITBIN) $@ /HEAP:1048576,1048576 /LARGEADDRESSAWARE\n");
fd.write("\tif exist [email protected] $(MT) -manifest [email protected]
-outputresource:$@;1\n");
if condname:
@@ -742,8 +742,8 @@
SCRIPTS.append(target)
fd.write(srcs + "\n")
fd.write("%s.exe: $(%s_OBJS)\n" % (bin, bin.replace('-','_')))
- fd.write('\t"$(TOPDIR)\\..\\NT\\wincompile.py" $(CC) $(CFLAGS)')
- fd.write(" -Fe%s.exe $(%s_OBJS) /link @<<\n$(%s_LIBS)
/subsystem:console /NODEFAULTLIB:LIBC\n<<\n" % (bin, bin.replace('-','_'),
bin.replace('-','_')))
+ fd.write('\t$(CC) $(CFLAGS)')
+ fd.write(" -Fe%s.exe $(%s_OBJS) /link $(%s_LIBS) /subsystem:console
/NODEFAULTLIB:LIBC\n" % (bin, bin.replace('-','_'), bin.replace('-','_')))
fd.write("\tif exist [email protected] $(MT) -manifest [email protected]
-outputresource:$@;1\n\n");
if SCRIPTS:
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
