Commit Graph

3179 Commits

Author SHA1 Message Date
J. Perkins
c121b2f6b5
Merge branch 'master' into codelite-libdirs 2018-04-16 14:24:08 -04:00
J. Perkins
c802adfdd2
Merge pull request #1053 from LORgames/ssurtees/floatingpointFix
Fixed issue with floatingpoint "Strict" causing errors in XCode
2018-04-16 12:21:49 -04:00
Sam Surtees
15426309b3 Fixed issue with floatingpoint "Strict" causing errors in XCode 2018-04-15 22:25:27 +10:00
Tom van Dijck
6c7c6c7171
Merge pull request #889 from tdesveaux/fix-mergeFilters
Fix context.mergeFilters
2018-04-14 09:53:35 +02:00
Thomas Desveaux
a8ad766612 Remove no longer used table.joinunique 2018-04-13 19:06:36 +02:00
thomas desveaux
22e36f97b8 Better performance on fix issue #884 2018-04-12 23:40:16 +02:00
thomas desveaux
15829d5967 Merge remote-tracking branch 'premake/master' into fix-mergeFilters 2018-04-12 23:34:25 +02:00
Tom van Dijck
776a4c92b9
Merge pull request #1011 from Dandielo/patch-1
Fixes an issue with custom rules tracking files.
2018-04-12 20:48:02 +02:00
Tom van Dijck
8eecb5cfa7
Merge pull request #1046 from tdesveauxPKFX/struct-member-align
Add structmemberalign API
2018-04-12 20:45:55 +02:00
Thomas Desveaux
80e2bb02e6 Merge remote-tracking branch 'origin/master' into struct-member-align 2018-04-11 14:08:50 +02:00
Samuel Surtees
dc641e5c69
Merge pull request #1045 from tdesveauxPKFX/debuggerflavor
Add debuggerflavor API
2018-04-11 18:48:03 +10:00
Samuel Surtees
d8573d975c
Merge pull request #1042 from tdesveauxPKFX/unsigned-char
Add UnsignedChar API
2018-04-11 09:43:51 +10:00
Thomas Desveaux
228bba9702 Implement unsignedchar tests for CodeLite 2018-04-10 22:03:12 +02:00
Thomas Desveaux
6ad87a76c1 Implement unsignedchar for xcode 2018-04-10 21:54:51 +02:00
Thomas Desveaux
159281ea5a Implement unsignedchar for vstudio 2018-04-10 21:38:31 +02:00
Thomas Desveaux
d556b6510f Implement unsignedchar for msc 2018-04-10 20:24:05 +02:00
Thomas Desveaux
40f258b2d1 Implement unsignedchar for clang 2018-04-10 20:14:22 +02:00
tdesveauxPKFX
2794751092
Merge branch 'master' into unsigned-char 2018-04-10 20:11:41 +02:00
Thomas Desveaux
7d23654c16 structmemberalign: simplify API 2018-04-10 20:10:49 +02:00
tdesveauxPKFX
c92c58037b
Merge branch 'master' into struct-member-align 2018-04-10 20:02:02 +02:00
Thomas Desveaux
92f0f08648 debuggerflavor: use simpler terms in api 2018-04-10 20:00:41 +02:00
Thomas Desveaux
6fdb94a5f2 Merge remote-tracking branch 'origin/master' into debuggerflavor 2018-04-10 19:54:53 +02:00
Tom van Dijck
cb1f642485
Merge pull request #1041 from LORgames/ssurtees/ci
Fleshed out CI builds
2018-04-10 11:48:59 +02:00
J. Perkins
0db3f5680b
Merge pull request #1037 from tdesveauxPKFX/vstudio-fxcompile
HLSL Shader compilation in Visual Studio
2018-04-09 12:03:47 -04:00
Thomas Desveaux
b981e67e89 Add structmemberalign API + implement for vstudio 2018-04-09 17:23:10 +02:00
Thomas Desveaux
ed2b419128 Add debuggerflavor API + implement for vstudio 2018-04-09 17:20:38 +02:00
Thomas Desveaux
ba8835fb54 Add UnsignedChar API + implement for gcc 2018-04-09 16:59:02 +02:00
Sam Surtees
d995f687ef Fleshed out CI builds
- Extended Bootstrap.mak to allow users to specify platform and configuration
2018-04-09 22:12:10 +10:00
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
e06097b20b
Merge branch 'master' into codelite-libdirs 2018-04-06 12:23:06 -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
53ec0cc3bf
Merge branch 'master' into patch-1 2018-04-05 12:42:46 +02: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