summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorCremno <[email protected]>2013-01-21 10:59:24 +0100
committerCremno <[email protected]>2013-01-21 10:59:24 +0100
commit94776fd8fc986a80e5ef6b91e0ac915ec14752cb (patch)
tree4b48467b50e97506e79759abe36e581e20231f87
parent84ef21a4d5616f50b1182af61996983e39a08554 (diff)
downloadmruby-94776fd8fc986a80e5ef6b91e0ac915ec14752cb.tar.gz
mruby-94776fd8fc986a80e5ef6b91e0ac915ec14752cb.zip
vs2012 toolchain: various fixes
CC: / instead of - (cosmetic change) LD: removed default libraries and fixed options syntax AR: added /nologo
-rw-r--r--tasks/toolchains/vs2012.rake16
1 files changed, 8 insertions, 8 deletions
diff --git a/tasks/toolchains/vs2012.rake b/tasks/toolchains/vs2012.rake
index 1f6ea2d65..c3599a59b 100644
--- a/tasks/toolchains/vs2012.rake
+++ b/tasks/toolchains/vs2012.rake
@@ -4,24 +4,24 @@ MRuby::Toolchain.new(:vs2012) do |conf|
cc.flags = [ENV['CFLAGS'] || %w(/c /nologo /W3 /D_DEBUG /MDd /Zi /Od /RTC1 /DDISABLE_GEMS /DHAVE_STRING_H /DNO_GETTIMEOFDAY /D_CRT_SECURE_NO_WARNINGS)]
cc.include_paths = ["#{root}/include"]
cc.defines = %w(DISABLE_GEMS)
- cc.option_include_path = '-I%s'
- cc.option_define = '-D%s'
- cc.compile_options = "%{flags} /Fo%{outfile} -c %{infile}"
+ cc.option_include_path = '/I%s'
+ cc.option_define = '/D%s'
+ cc.compile_options = "%{flags} /Fo%{outfile} %{infile}"
end
conf.linker do |linker|
linker.command = ENV['LD'] || 'link.exe'
linker.flags = [ENV['LDFLAGS'] || %w(/nologo)]
- linker.libraries = %w(kernel32 user32 gdi32 winspool comdlg32 advapi32 shell32 ole32 oleaut32 uuid odbc32 odbccp32)
- linker.library_paths = []
- linker.option_library = '-l%s'
- linker.option_library_path = '-L%s'
+ linker.libraries = %w()
+ linker.library_paths = %w()
+ linker.option_library = '%s'
+ linker.option_library_path = '/LIBPATH:%s'
linker.link_options = "%{flags} /OUT:%{outfile} %{objs} %{libs}"
end
conf.archiver do |archiver|
archiver.command = ENV['AR'] || 'lib.exe'
- archiver.archive_options = '/OUT:%{outfile} %{objs}'
+ archiver.archive_options = '/nologo /OUT:%{outfile} %{objs}'
end
conf.yacc do |yacc|