-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Enable MSVC builds with GNU Make by simply calling make MSVC=1 (Debug build possible by adding DEBUG=1 as well) Two scripts, clink.pl and lib.pl, are used to convert certain GCC specific command line options into something MSVC understands. By building for MSVC with GNU Make, we can ensure that the MSVC port always follows the latest code, and does not lag behind due to unmaintained NMake Makefile or IDE projects. Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
- Loading branch information
Marius Storm-Olsen
authored and
Junio C Hamano
committed
Sep 19, 2009
1 parent
386ac45
commit 164a5e3
Showing
3 changed files
with
128 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
#!/usr/bin/perl -w | ||
###################################################################### | ||
# Compiles or links files | ||
# | ||
# This is a wrapper to facilitate the compilation of Git with MSVC | ||
# using GNU Make as the build system. So, instead of manipulating the | ||
# Makefile into something nasty, just to support non-space arguments | ||
# etc, we use this wrapper to fix the command line options | ||
# | ||
# Copyright (C) 2009 Marius Storm-Olsen <mstormo@gmail.com> | ||
###################################################################### | ||
use strict; | ||
my @args = (); | ||
my @cflags = (); | ||
my $is_linking = 0; | ||
while (@ARGV) { | ||
my $arg = shift @ARGV; | ||
if ("$arg" =~ /^-[DIMGO]/) { | ||
push(@cflags, $arg); | ||
} elsif ("$arg" eq "-o") { | ||
my $file_out = shift @ARGV; | ||
if ("$file_out" =~ /exe$/) { | ||
$is_linking = 1; | ||
push(@args, "-OUT:$file_out"); | ||
} else { | ||
push(@args, "-Fo$file_out"); | ||
} | ||
} elsif ("$arg" eq "-lz") { | ||
push(@args, "zlib.lib"); | ||
} elsif ("$arg" eq "-liconv") { | ||
push(@args, "iconv.lib"); | ||
} elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") { | ||
$arg =~ s/^-L/-LIBPATH:/; | ||
push(@args, $arg); | ||
} elsif ("$arg" =~ /^-R/) { | ||
# eat | ||
} else { | ||
push(@args, $arg); | ||
} | ||
} | ||
if ($is_linking) { | ||
unshift(@args, "link.exe"); | ||
} else { | ||
unshift(@args, "cl.exe"); | ||
push(@args, @cflags); | ||
} | ||
#printf("**** @args\n"); | ||
exit system(@args); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
#!/usr/bin/perl -w | ||
###################################################################### | ||
# Libifies files on Windows | ||
# | ||
# This is a wrapper to facilitate the compilation of Git with MSVC | ||
# using GNU Make as the build system. So, instead of manipulating the | ||
# Makefile into something nasty, just to support non-space arguments | ||
# etc, we use this wrapper to fix the command line options | ||
# | ||
# Copyright (C) 2009 Marius Storm-Olsen <mstormo@gmail.com> | ||
###################################################################### | ||
use strict; | ||
my @args = (); | ||
while (@ARGV) { | ||
my $arg = shift @ARGV; | ||
if ("$arg" eq "rcs") { | ||
# Consume the rcs option | ||
} elsif ("$arg" =~ /\.a$/) { | ||
push(@args, "-OUT:$arg"); | ||
} else { | ||
push(@args, $arg); | ||
} | ||
} | ||
unshift(@args, "lib.exe"); | ||
# printf("**** @args\n"); | ||
exit system(@args); |