AuroraPipeline/premake
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #1197 from LORgames/ssurtees/makefileFixes

Browse Source 
Added missing elements in Visual Studio Makefile projects
This commit is contained in:
Samuel Surtees 2018-11-30 11:19:21 +10:00 committed by GitHub
commit 6fc0497d6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
modules/vstudio/tests/vc2010/test_nmake_props.lua
View File

@ -151,6 +151,39 @@ command 2</NMakeBuildCommandLine>
]] ]]
end end
function suite.onBinDirs()
bindirs { "include/lua", "include/zlib" }
prepare()
test.capture [[
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ExecutablePath>$(ProjectDir)include\lua;$(ProjectDir)include\zlib;$(ExecutablePath)</ExecutablePath>
<NMakeOutput>$(OutDir)MyProject</NMakeOutput>
</PropertyGroup>
]]
end
function suite.onSysIncludeDirs()
sysincludedirs { "include/lua", "include/zlib" }
prepare()
test.capture [[
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IncludePath>include\lua;include\zlib;$(IncludePath)</IncludePath>
<NMakeOutput>$(OutDir)MyProject</NMakeOutput>
</PropertyGroup>
]]
end
function suite.onSysLibDirs()
syslibdirs { "include/lua", "include/zlib" }
prepare()
test.capture [[
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LibraryPath>include\lua;include\zlib;$(LibraryPath)</LibraryPath>
<NMakeOutput>$(OutDir)MyProject</NMakeOutput>
</PropertyGroup>
]]
end
-- --
-- Should not emit include dirs or preprocessor definitions if the project -- Should not emit include dirs or preprocessor definitions if the project

3
modules/vstudio/vs2010_vcxproj.lua
View File

@ -253,6 +253,9 @@
m.elements.nmakeProperties = function(cfg) m.elements.nmakeProperties = function(cfg)
return { return {
m.executablePath,
m.includePath,
m.libraryPath,
m.nmakeOutput, m.nmakeOutput,
m.nmakeBuildCommands, m.nmakeBuildCommands,
m.nmakeRebuildCommands, m.nmakeRebuildCommands,