From 5f8f4be350b68ed4338ca509a268452680ef0521 Mon Sep 17 00:00:00 2001 From: Daniel Collin Date: Fri, 6 Jun 2014 14:38:52 +0200 Subject: [PATCH] Cleanup and Win32 IDE hints --- tundra.lua | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/tundra.lua b/tundra.lua index 567f10d..3d17f57 100644 --- a/tundra.lua +++ b/tundra.lua @@ -7,7 +7,7 @@ local win32 = { CCOPTS = { "/FS", "/W4", - "/WX", "/I.", "/D_CRT_SECURE_NO_WARNINGS", "\"/DOBJECT_DIR=$(OBJECTDIR:#)\"", + "/WX", "/I.", "/D_CRT_SECURE_NO_WARNINGS", { "/Od"; Config = "*-*-debug" }, { "/O2"; Config = "*-*-release" }, }, @@ -17,10 +17,6 @@ local win32 = { }, }, - - ReplaceEnv = { - ["OBJCCOM"] = "dummy", -- no ObjC compiler - }, } local macosx = { @@ -36,6 +32,24 @@ local macosx = { } Build { + IdeGenerationHints = { + Msvc = { + PlatformMappings = { + ['win32-msvc'] = 'Win32', + ['win32-msvc'] = 'Win64', + }, + FullMappings = { + ['win32-msvc-debug-default'] = { Config='Debug', Platform='Win32' }, + ['win32-msvc-production-default'] = { Config='Production', Platform='Win32' }, + ['win32-msvc-release-default'] = { Config='Release', Platform='Win32' }, + ['win64-msvc-debug-default'] = { Config='Debug', Platform='Win64' }, + ['win64-msvc-production-default'] = { Config='Production', Platform='Win64' }, + ['win64-msvc-release-default'] = { Config='Release', Platform='Win64' }, + }, + }, + MsvcSolutions = { ['minfb.sln'] = { } }, + }, + Configs = { Config { Name = "win32-msvc", Inherit = win32, Tools = { "msvc" }, SupportedHosts = { "windows" }, }, Config { Name = "win64-msvc", Inherit = win32, Tools = { "msvc" }, SupportedHosts = { "windows" }, },