Commit Graph

3143 Commits

Author SHA1 Message Date
tdesveaux
40a01361d3 VStudio: Add tests for FxCompile block 2018-04-07 19:16:29 +02:00
tdesveaux
c9870879c6 VStudio: Implement FxCompile block for hlsl shader compilation 2018-04-07 19:15:45 +02:00
Tom van Dijck
2ac3153f81
Merge pull request #1020 from redorav/luasocket
Embed luasocket, add mobdebug and --debugger command line option
2018-04-07 14:46:12 +02:00
Tom van Dijck
d7950bcac7
Merge branch 'master' into luasocket 2018-04-07 14:33:13 +02:00
Tom van Dijck
d2b066137b
Merge pull request #1033 from tdesveauxPKFX/vstudio-staticlib-symbolspath
vstudio staticlib symbolspath
2018-04-07 14:30:37 +02:00
redorav
e2afd0bbfd
Merge branch 'master' into luasocket 2018-04-06 19:16:26 +01:00
tdesveauxPKFX
5a1b8ad287
Merge branch 'master' into vstudio-staticlib-symbolspath 2018-04-06 19:04:45 +02:00
Thomas Desveaux
825c1b989a VStudio: Factorise conditions and value for ProgramDataBaseFile[Name] 2018-04-06 19:04:19 +02:00
J. Perkins
5c6f47d6ff
Merge pull request #1034 from LORgames/ssurtees/android
Add 'modules/android/' from premake-android
2018-04-06 12:24:50 -04:00
J. Perkins
e4c9b5717d
Merge branch 'master' into luasocket 2018-04-06 12:22:40 -04:00
tdesveauxPKFX
324c3bb757
Merge branch 'master' into vstudio-staticlib-symbolspath 2018-04-05 18:30:02 +02:00
Thomas Desveaux
40e0539aa0 VStudio: Extract ProgramDataBaseFileName from vstudio.programDatabaseFile 2018-04-05 18:28:38 +02:00
Sam Surtees
f7626d4e2a Add 'modules/android/' from premake-android
- Additional changes to get tests working
2018-04-05 20:58:31 +10:00
Tom van Dijck
d094923538
Merge pull request #1031 from tdesveauxPKFX/fix-gmake2-callarray
Fix gmake2 Makefile projects callArray
2018-04-05 12:38:18 +02:00
Tom van Dijck
d93ae33a7f
Merge branch 'master' into luasocket 2018-04-05 12:34:41 +02:00
Thomas Desveaux
bd2aff7ef2 VStudio: symbolspath tests generateDebugInfo -> generateProgramDataBaseFile 2018-04-03 20:21:48 +02:00
Thomas Desveaux
2bb0800b04 VStudio: Add tests for symbolspath 2018-04-03 20:18:50 +02:00
Thomas Desveaux
75692a7920 VStudio: Implement symbolspath for static libs 2018-04-03 20:03:18 +02:00
J. Perkins
c461176e29
Merge branch 'master' into fix-gmake2-callarray 2018-04-03 10:35:01 -04:00
J. Perkins
5ee5d651b3
Merge pull request #1029 from starkos/improve-api-reset
Replace last global state block in api.reset
2018-04-03 06:39:38 -04:00
J. Perkins
02a28a38e3
Merge pull request #1030 from tdesveauxPKFX/fix-vstudio-symbolspath
Fix vstudio symbolspath
2018-04-03 06:39:22 -04:00
thomas desveaux
04f22eead1 Gmake2: Clean Makefile tests 2018-04-02 21:18:40 +02:00
thomas desveaux
dbf36a5f97 Gmake2: Add tests for Makefile project kind 2018-04-02 21:15:24 +02:00
thomas desveaux
bc71ad0d9e Gmake2: Fix callArray calls 2018-04-02 20:25:57 +02:00
tdesveaux
9ecde94dd2 VStudio: Fix symbolspath not generated for FastLink and Full 2018-04-02 19:45:51 +02:00
tdesveaux
be01050638 VStudio: Add tests for symbolspath 2018-04-02 19:44:06 +02:00
Jason Perkins
a038f5f459 Replace last global state block in api.reset
Follow up to #1021: I removed the state blocks added by the tests, but neglected to put back a new, empty global state block for the next run.
2018-04-02 09:59:34 -04:00
redorav
fae731656a
Merge branch 'master' into luasocket 2018-03-30 12:46:10 +01:00
Emilio López
4921e8a736 Merge branch 'luasocket' of https://github.com/redorav/premake-core into luasocket 2018-03-30 12:41:25 +01:00
Emilio López
51aae62dcb Move luasocket from being a static lib to a binary module 2018-03-30 12:37:25 +01:00
J. Perkins
b1b299e023
Merge pull request #1018 from LORgames/ssurtees/releaseInfoBadges
Added release info badges to the readme
2018-03-26 12:34:21 -04:00
J. Perkins
7864c0b974
Merge branch 'master' into ssurtees/releaseInfoBadges 2018-03-26 12:30:05 -04:00
Samuel Surtees
5348773851
Merge pull request #952 from tempura-sukiyaki/xcode4-targetextension
Add support for `targetextension` in xcode4
2018-03-24 16:29:47 +10:00
Sam Surtees
24eea88e1f Added release info badges to the readme 2018-03-24 16:23:59 +10:00
J. Perkins
428e9b3927
Merge pull request #1021 from starkos/improve-api-reset
Clear additional global state between unit test runs
2018-03-23 13:59:31 -04:00
Tom van Dijck
eb9897a2c0
Merge branch 'master' into improve-api-reset 2018-03-23 15:31:17 +01:00
redorav
a013b6aa62
Merge branch 'master' into luasocket 2018-03-23 08:36:48 +00:00
J. Perkins
3e204522ec
Merge pull request #1005 from premake/fix_deps
Fix gmake dependencies
2018-03-22 14:59:46 -04:00
J. Perkins
1c94b17d2c
Merge branch 'master' into fix_deps 2018-03-22 11:37:52 -04:00
Manu Evans
1cd1f4df6c Update tests. 2018-03-21 16:45:36 -07:00
Manu Evans
ba96baa62c Attempt to fix the gmake dependency chain 2018-03-21 16:45:36 -07:00
Jason Perkins
e34c23b64f Clear additional global state between unit test runs
Clears out some global state that was being left over between unit tests runs, causing indeterminate results when running multiple tests against data at the global scope.
2018-03-19 10:10:56 -04:00
redorav
87fe90d4d2
Merge branch 'master' into luasocket 2018-03-17 15:18:23 +00:00
Emilio López
09dbeff23f Looking at the luasocket makefile it seems LUASOCKET_API needs to be defined as __attribute__((visibility(\"default\"))) on all platforms except Windows 2018-03-17 15:15:07 +00:00
Emilio López
8aa7370dda system:not does not allow spaces so fix that as build fails otherwise 2018-03-17 14:56:38 +00:00
Emilio López
b1f352bf67 Embed luasocket as a static library
Add mobdebug lua script to allow debugging premake with ZeroBrane Studio
Add --debugger command line option to enable debugging
2018-03-17 14:47:40 +00:00
J. Perkins
0c17303436
Merge pull request #1019 from Passw/patch-1
Remove git submodule commands
2018-03-17 10:41:42 -04:00
Passw
29d02a3d21 Remove git submodule commands
It seems that there is no git submodule any more
2018-03-16 10:59:31 +08:00
Samuel Surtees
0eda22c602
Merge pull request #988 from LORgames/ssurtees/pathNormalizationFix
Fixed a bug with normalizing paths that contain dot folders
2018-02-05 21:56:03 +10:00
Samuel Surtees
ae8e3b02ad
Merge pull request #994 from dcourtois/issue_935
added a 'latest' systemversion for vs2017
2018-01-18 21:01:20 +10:00