Skip to content

Commit

Permalink
Fix zpm tests
Browse files Browse the repository at this point in the history
  • Loading branch information
pevisscher committed Aug 7, 2016
1 parent 82ede3c commit 3db692c
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 6 deletions.
19 changes: 14 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
-- artifacts
bin/*
test/obj/*
test/bin/*

-- zpm
._config.json
.config.json

-- git
*.orig

-- make
Makefile

-- make
Makefile
*.make
Expand All @@ -26,4 +25,14 @@ Makefile
*.vcxproj*

-- Intel Tools
*Amplifier*
*Amplifier*

-- Docs
*.chi
*.chm

-- ZPM
extern/
assets/
test/extern
test/assets
9 changes: 8 additions & 1 deletion test/premake5.lua
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,11 @@ workspace "BSPLib-ZPM"

zefiros.setTestZPMDefaults( "bsp", {
mayLink = false
} )
} )

project "bsp-zpm-test"

zpm.uses {
"Zefiros-Software/ArmadilloExt",
"Zefiros-Software/BSPLib"
}

0 comments on commit 3db692c

Please sign in to comment.