diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-01-21 03:04:29 -0800 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-01-21 03:04:29 -0800 |
| commit | cc2e4e73deea917ffd0c9ce6ad2840455df7b60b (patch) | |
| tree | 65d50849d1ea0b89b5730bc405c332978abc421c /tasks/toolchains | |
| parent | 7987619bedf30e1ff764599416282af07e096e65 (diff) | |
| parent | 94776fd8fc986a80e5ef6b91e0ac915ec14752cb (diff) | |
| download | mruby-cc2e4e73deea917ffd0c9ce6ad2840455df7b60b.tar.gz mruby-cc2e4e73deea917ffd0c9ce6ad2840455df7b60b.zip | |
Merge pull request #762 from cremno/vs2012-toolchain-fixes
vs2012 toolchain: various fixes
Diffstat (limited to 'tasks/toolchains')
| -rw-r--r-- | tasks/toolchains/vs2012.rake | 16 |
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| |