AuroraPipeline/fuck-premake-old2
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
2,554 Commits 1 Branch 0 Tags 32 MiB
e47ba372c8
Commit Graph

2554 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aleksijuvani
e47ba372c8 Add NoLinkObjects flag 
The default behaviour is to link .obj files if a custom build command
outputs them, but there are some cases where we don't want this to
happen, such as when dealing with Wavefront .obj model files.

This commit will prevent the automatic linking of .obj files that have
this new flag.

When an obj file is outputted by a custom build command, this prevents
the linker from linking it. This is necessary, for example, when
dealing with obj model files.
 2016-11-22 00:18:08 +02:00
Tom van Dijck
2b887281c1 Merge pull request #633 from starkos/fix-http-build-warnings 
Fix data type conversion warnings in HTTP response handling
 2016-11-21 11:01:09 -08:00
Jason Perkins
30e8e4b510 Fix data type conversion warnings in HTTP response handling 2016-11-21 11:41:04 -05:00
Tom van Dijck
7f1b426f21 Merge pull request #625 from starkos/phase-out-submodules 
Move core modules into main repository; drop submodules
 2016-11-10 20:17:39 -08:00
Jason Perkins
af7b674265 Move core modules into main repository; drop submodules 
As discussed numerous times, get rid of the submodule approach for core modules and just included the sources directly in the main repository.

I have no idea how this will play with existing working copies. It might be necessary to [manually clear out the existing submodules](http://stackoverflow.com/questions/1260748) first.
 2016-11-09 14:29:33 -05:00
Samuel Surtees
71be275023 Merge pull request #618 from Blizzard/fix-for-fastlink 
Fix for debugInformationFormat handling with FastLink.
 2016-11-08 11:04:44 +10:00
Samuel Surtees
4c5b4b8445 Merge pull request #521 from Blizzard/default-clang-macosx 
Select clang as default tool on MacOSX.
 2016-11-08 10:55:35 +10:00
Tom van Dijck
ca89c9d79b Fix for debugInformationFormat handling with FastLink. 2016-11-07 09:44:47 -08:00
Tom van Dijck
449163ebf3 Select clang as default tool on MacOSX. 2016-11-07 08:54:25 -08:00
Samuel Surtees
30dda54f12 Merge pull request #600 from sbx320/bugfix/598 
Fix for #598
 2016-11-04 12:02:24 +10:00
Samuel Surtees
4985e5b8f4 Merge pull request #607 from LORgames/ssurtees/monodevelop 
Removed MonoDevelop from core
 2016-11-04 11:24:49 +10:00
Samuel Surtees
1b9af9aa6c Merge branch 'master' into bugfix/598 2016-11-04 03:17:04 +10:00
Samuel Surtees
9eedf6b5d8 Merge branch 'master' into ssurtees/monodevelop 2016-11-04 03:10:59 +10:00
Tom van Dijck
8b9130dc5d Merge pull request #613 from LORgames/ssurtees/dotFileFix 
Added a test dot file instead of relying on .gitignore to be shipped
 2016-11-03 10:07:02 -07:00
Sam Surtees
ac88483ccc Added a test dot file instead of relying on .gitignore to be shipped 
Fixes #595
 2016-11-03 21:22:42 +10:00
Samuel Surtees
f5707c4d4e Merge pull request #611 from sbx320/bugfix/pchforceinclude 
make: Fix forceincludes breaking precompiled headers
 2016-11-03 20:33:01 +10:00
Samuel Surtees
e91bc6d57e Merge pull request #610 from mikisch81/vstudio-makefile-proj-includes-defines 
Apply includedirs and defines for makefile projects in Visual Studio
 2016-11-03 20:15:26 +10:00
Samuel Surtees
ecc0d0b739 Merge pull request #608 from mikisch81/fix-vstudio-staticlib-deps 
VStudio: Add additional deps & additional libdirs for static lib
 2016-11-03 20:10:10 +10:00
Samuel Surtees
81a9df934b Merge pull request #603 from andryblack/arargs 
allow override AR arguments
 2016-11-03 20:06:58 +10:00
Samuel Surtees
2e74dd464f Merge pull request #605 from LORgames/ssurtees/fixedObjdirsPrefixCode 
Fixed bug with objdirs prefix code '!'
 2016-11-03 19:23:05 +10:00
Samuel Surtees
2b85869c24 Merge pull request #583 from LORgames/ssurtees/duplicateBuildCommands 
Added ability for duplicate build commands to be specified
 2016-11-03 19:20:47 +10:00
Sam Surtees
e8789acbe7 Added ability for duplicate build commands to be specified. Fixes #540 2016-11-03 19:16:37 +10:00
sbx320
52b9d1164f make: Fix forceincludes breaking precompiled headers 2016-11-02 06:32:47 +01:00
Michael Schwarcz
3444ef8e04 Apply includedirs and defines for makefile projects in vs 
- This will help Intellisense when viewing makefile projects on Visual Studio
 2016-11-01 13:17:09 +02:00
Michael Schwarcz
5f7e7b6802 Added tests 2016-10-31 09:38:11 +02:00
Michael Schwarcz
3328cfea38 VStudio: Add additionalDependencies & additionalLibraryDirectories for static lib 
- Currently if static library links with another non-sibling library build fails.
   For example: If using the socket() API on windows in a static library, need to link with ws2_32.lib.
 2016-10-30 16:09:15 +02:00
Sam Surtees
e300d4c619 Removed MonoDevelop from core 
The format output is no longer supported by the IDE, instead Visual Studio projects are utilized instead. See issue #604 for more information on deprecation.
 2016-10-29 12:25:47 +10:00
Sam Surtees
c543565f73 Fixed bug with objdirs prefix code '!' 
- Fixed flawed tests that manipulated the actual result before testing it
- Added test to ensure prefix code '!' works
 2016-10-28 01:53:55 +10:00
Andrey Kunitsyn
65ced6a6b0 allow override ar arguments 2016-10-27 00:05:40 +03:00
sbx320
1bf479bfdc Fix symbolspath setting ProgramDataBaseFileName instead of ProgramDatabaseFile 2016-10-20 07:29:22 +02:00
Jason Perkins
bf4bf55d11 Merge pull request #597 from akaStiX/edit_and_continue_vs2015 
Enable Edit and Continue for x64 builds on VS2015
 2016-10-18 12:15:48 -04:00
StiX
4f3b19f581 Enable Edit and Continue for x64 builds on VS2015 2016-10-17 22:05:54 +02:00
Jason Perkins
f104467e9b Merge branch 'release-5.0-alpha10' 2016-10-04 19:09:14 -04:00
Jason Perkins
152bfbfd08 Restore dev version 2016-10-04 19:09:00 -04:00
Jason Perkins
25e6103a8e Use icons instead of labels on test results row of README 2016-10-04 18:37:23 -04:00
Jason Perkins
f7ad169c70 Update support files and bump version to alpha10 2016-10-04 18:18:00 -04:00
Jason Perkins
98fa40dad3 Update submodules to latest versions 2016-10-04 18:09:37 -04:00
Tom van Dijck
87d0a59b85 Merge pull request #587 from DPSLynix/patch-1 
Host/Posix: Fix os.copyfile with spaces in argument paths.
 2016-09-28 08:53:40 -07:00
Jérôme Leclercq
a42c50b4cc Host/Posix: Fix os.copyfile with spaces in argument paths. 2016-09-28 16:39:47 +02:00
Tom van Dijck
f85225e329 Merge pull request #581 from LORgames/ssurtees/pathNormalizeFix 
Fixed bug with path.normalize
 2016-09-22 08:35:56 -07:00
Sam Surtees
c6af364311 Fixed bug where path.normalize was being overzealous with removing instances of ".." breaking paths. Fixes #579 2016-09-21 01:40:27 +10:00
Samuel Surtees
7a09873ed4 Merge pull request #580 from lailongwei/master 
fix windows platform compile error
 2016-09-20 20:11:56 +10:00
lailongwei
bd36129b83 fix windows platform compile error 2016-09-20 16:51:10 +08:00
Samuel Surtees
8d46a84f08 Merge pull request #575 from Blizzard/add-raw-module 
Add raw module as a standard module.
 2016-09-19 21:01:04 +10:00
Tom van Dijck
531f70a559 disable module by default. 2016-09-15 13:36:00 -07:00
Tom van Dijck
785671fad5 Merge pull request #545 from tvandijck/generated-files-vcxproj 
Add generated files to vxcproj file.
 2016-09-07 08:14:57 -07:00
Tom van Dijck
351fbc9b97 workaround for https://github.com/premake/premake-core/issues/572 2016-09-07 08:04:48 -07:00
Tom van Dijck
7d7daae3a7 Merge pull request #573 from Blizzard/workaround-572 
Workaround for #572
 2016-09-07 08:02:09 -07:00
Tom van Dijck
dd3cbd3feb add a case to test parent flags... 2016-09-06 11:54:04 -07:00
Tom van Dijck
1559c15ee0 workaround for https://github.com/premake/premake-core/issues/572 2016-09-06 11:27:45 -07:00