Commit graph

47 commits

Author SHA1 Message Date
Colin Finck c2c66aff7d Git conversion: Make reactos the root directory, move rosapps, rostests, wallpapers into modules, and delete rossubsys. 2017-10-03 07:45:34 +00:00
Timo Kreuzer e8937c0896 [CMAKE] Add CL version 19.11 from VS 2017 version 15.3.3 to configure.cmd
svn path=/trunk/; revision=75743
2017-09-02 16:27:38 +00:00
Alex Ionescu 9ae2e91963 [CONFIGURE]: Better fix thanks to gigaherz.
svn path=/trunk/; revision=73682
2017-02-04 18:55:47 +00:00
Alex Ionescu 9feb079172 [CONFIGURE]: Hack-support VS15 (VS 2017)
svn path=/trunk/; revision=73680
2017-02-04 17:59:32 +00:00
Colin Finck 270d4db920 Test commit to fix the nightmare caused by "previous" r71352.
See https://reactos.org/archives/public/ros-dev/2016-May/017845.html

svn path=/trunk/; revision=71352
2016-05-18 17:01:01 +00:00
Sylvain Petreolle 4a708c0f30 [CONFIGURE]
Addendum to r69601:
host-tools are "no longer required" but actually still exist.
Add the CMakeCache cleanup for them.


svn path=/trunk/; revision=71204
2016-04-24 22:40:53 +00:00
Sylvain Petreolle 4a8d75d6ba [CONFIGURE]
NEW_STYLE_BUILD is used for official builds.
Enable it.

svn path=/trunk/; revision=69675
2015-10-24 12:30:42 +00:00
Daniel Reimer edca40a05a - "::" instead of "REM" inside a if () in batch is evil and can cause a really nice mess from time to time.
- Changing one "exit" to "exit /b" was not nice from me in the past.
ARM build now prepares host tools nicely again and you can build em. ARM build itself dies very early due to ..\..\boot\freeldr\freeldr\arch\arm\boot.S(9) : fatal error C1083: Cannot open include file: 'ksarm.h': No such file or directory

svn path=/trunk/; revision=69191
2015-09-12 09:51:25 +00:00
Amine Khaldi c4cd6e2035 [CONFIGURE] First step towards introducing a way to compile ReactOS without invoking CMake twice. NFC. CORE-10121
svn path=/trunk/; revision=69058
2015-09-06 16:17:26 +00:00
David Quintana 300237adee [CONFIGURE.CMD]
Add a case for VSSolution generation with VS14. It DOES NOT WORK with the cmake version we use currently, but it's better to have the error rather than generating ninja files without warning.

svn path=/trunk/; revision=68551
2015-07-22 13:58:05 +00:00
David Quintana 3933ca6bce This commit brings support for compiling ReactOS with Visual Studio 2015 RC (and possibly the final release).
[BUILD]
msvc.cmake: Disable thread-local static initialization.
CMakeLists.txt: Disable PCH for VS2015.
configure.cmd: Make it aware of cl.exe version 19.x

[CPPRT]
Add alias for the new variants of the delete operators.

[BROWSEUI]
[MFIFS]
[FRAMEDYN]
[NDIS]
[DDK]
[PSDK]
[STLPORT]
Add explicit declarations of the new delete operators for those modules that don't use the WITH_RUNTIME option.

[WIDL]
[WPP]
Do not alias the snprintf family of functions to the _snprintf variants, since VS14 already declares them internally.

svn path=/trunk/; revision=67483
2015-04-30 21:48:26 +00:00
Timo Kreuzer 40369c24e3 [CMAKE]
Improve configure script to allow passing multiple arguments, like "configure VSSolution RTC". Add a small help command ("help" or "/?"), allow passing CMake parameters like -DFOO:BOOL=TRUE after our custom parameters.

svn path=/trunk/; revision=64971
2014-10-24 19:17:58 +00:00
Amine Khaldi 2047c64c1f [CMAKE]
* Use the x86 toolchain for host tools if the targeting platform is ARM. Brought to you by Yuntian Zhang.
CORE-7407 #resolve #comment Committed in r64849. Thanks!

svn path=/trunk/; revision=64849
2014-10-20 17:35:22 +00:00
Sylvain Petreolle 274ee3388d [CMAKE]
Set types for variables we pass to cmake.
Specifying no type makes them UNINITIALIZED and can cause values to be ignored.
See https://www.mail-archive.com/cmake@cmake.org/msg17305.html for details.


svn path=/trunk/; revision=62933
2014-04-23 18:59:30 +00:00
Hermès Bélusca-Maïto 7f4064a788 Resurrect MSVC 2008 builds.
ACHTUNG! ACHTUNG! Even if you can build ROS with MSVC 2008, you cannot boot it (see the below-mentioned JIRA report) ACHTUNG! ACHTUNG!
CORE-8023 #comment MSVC 2008 build resurrected in revision 62595.

svn path=/trunk/; revision=62595
2014-03-31 20:59:32 +00:00
Timo Kreuzer eaf929fbe9 [CMAKE]
Add simple clang support to configure.cmp (use "configure clang", which will use ninja as the generator and clang as the compiler)

svn path=/trunk/; revision=62385
2014-03-02 19:53:15 +00:00
Amine Khaldi 83164605f5 [CMAKE]
* Set PCH as on by default for RosBE 2.1.1 users.
* You guys no longer need to alter anything now, just grab RosBE 2.1.1 and have fun ;)
CORE-7716

svn path=/trunk/; revision=62151
2014-02-13 21:42:05 +00:00
Amine Khaldi 0a7cd08914 [CMAKE]
* Initialize the PCH CMake define in the MSVC builds too.

svn path=/trunk/; revision=62144
2014-02-13 11:44:05 +00:00
Thomas Faber 50b0c50023 [CMAKE]
- Add configure support for VS 2013
- Add a missing /nologo to assembler invocations
- Properly complain about old MSVC versions during configure instead of failing the build

svn path=/trunk/; revision=59488
2013-07-14 21:00:42 +00:00
Thomas Faber 915aea7b1a [CMAKE]
- Try again to fix version detection. If anyone sees compilers that are not .00 versions, please complain. This is required because a simply "contains" check can match all parts of the version number -- e.g. 16.00.40219.01 contains "19." in addition to "16."

svn path=/trunk/; revision=59443
2013-07-07 09:42:57 +00:00
Hermès Bélusca-Maïto 82d21b524a Revert revision r59381 since it fails to detect VS2010 (and I suppose the other ones, then).
Indeed with VS2010, checking for the string content " 16." instead of "16." makes version checking fail.
After checking with a hex editor what was the character preceding the number "1" of the "16." part of the
version string returned by cl.exe, I saw that it wasn't a space as thought by the author, but the character
of code 0xA0 ...

svn path=/trunk/; revision=59437
2013-07-07 00:23:34 +00:00
Thomas Faber 94167fa6cb [CMAKE]
- Fix MSVC version detection in configure.cmd
CORE-7337 #comment VS12 is not supported by CMake yet. With r59381, configure should at least give you a proper error message.

svn path=/trunk/; revision=59381
2013-06-30 08:28:05 +00:00
Hermès Bélusca-Maïto 06b7934445 [CMAKE]
As ThFabba said:
" - Properly escape exclamation mark in configure message " <-- It's for delayed variable expansions in CMD scripts !! That's the true reason !
See r59281.

(The r59283 was a commit I've done because, independently (i.e. without seeing r59281), it happened for some reason that this phenomenon didn't appear at home, and after updating my local copy and rerunning a configure.cmd, I saw ^ characters before the ! . In fact it was because I temporarily disabled the delayed expansion vars in my configure script).

Therefore revert my error, shame on me :)

svn path=/trunk/; revision=59284
2013-06-22 11:11:35 +00:00
Hermès Bélusca-Maïto 68a58eafa6 - Remove two strange characters in configure.cmd
- Add a space between a word and an opening parenthese (in the informative message) in configure.sh

svn path=/trunk/; revision=59283
2013-06-22 10:54:11 +00:00
Thomas Faber b5de08425e [CMAKE]
- configure no longer defaults to nmake, don't confuse the user
- Properly escape exclamation mark in configure message

svn path=/trunk/; revision=59281
2013-06-22 08:05:50 +00:00
Hermès Bélusca-Maïto 6b811ad8f5 Finally,...
... use Ninja by default for compiling ReactOS !!

Users now have to do:

./configure

to use Ninja for building ReactOS.

The old method (using makefiles) is available by doing:

./configure Makefiles
(or: ./configure makefiles )

Tested by Amine and Sylvain (blame them ;) )

svn path=/trunk/; revision=59129
2013-05-31 21:04:28 +00:00
Thomas Faber e73afacf0f [CMAKE]
- Produce a proper error when add_cd_file is used with an unknown folder
- Remove an rbuild-leftover in reactos.dff.in
- Update outdated build tool message in configure

svn path=/trunk/; revision=59058
2013-05-20 18:27:07 +00:00
Hermès Bélusca-Maïto be155668e0 [CONFIGURE]
Fix MSVC configure build (problem of expansion of environment variables).

svn path=/trunk/; revision=58043
2012-12-29 19:23:02 +00:00
Aleksey Bragin 1748531321 [ROSBE]
- Support spaces in the source directory path on Windows.

svn path=/trunk/; revision=57059
2012-08-12 10:33:13 +00:00
Timo Kreuzer 505f66f454 [CMAKE]
Fix configure script for arm

[GENINC]
Add support for IMAGE_FILE_MACHINE_ARMNT

svn path=/trunk/; revision=56937
2012-07-22 16:29:47 +00:00
Timo Kreuzer d62e513aad [CMAKE]
Add support for MSVC ARM
Configuration script works as usual from VS 11 ARM command prompt, host tools is configured for x86 and must be compiled from a VS x86 command prompt.

svn path=/trunk/; revision=56935
2012-07-22 14:21:43 +00:00
Timo Kreuzer f6b6eea643 [CMAKE]
- Fix issues with newer cmake versions (brought to you by Amine)
- Add support for ninja to configure script

svn path=/trunk/; revision=56788
2012-06-23 16:09:11 +00:00
Amine Khaldi c3baab78ea [CMAKE]
* Remove some accidental changes.
[INETCPL]
* Include the correct pt language rc file.

svn path=/trunk/; revision=55892
2012-02-27 22:52:09 +00:00
Amine Khaldi 5e9ad9f31b * ReactOS binaries hold resource files to *all* the languages we support, which increases their size, and increases the memory footprint, and on top of that they become useless as soon as you select a language in the 1st stage installer. Introduce a way to compile ros with one localization so that we can compile ReactOS with only one localization, which eliminates the problem mentioned above, and allows us to reduce the compile time, the disk space needed for build, and the runtime memory footprint.
* The default build will continue to include all the localizations, but you can set it otherwise through a cmake variable (I18N_LANG) at configure time.
* Brought to you by Team Localization (Kamil Hornicek and Amine Khaldi) ;)

svn path=/trunk/; revision=55891
2012-02-27 22:46:20 +00:00
Thomas Faber 54cbf04c4a [CMAKE]
- Add VC11 support in configure.cmd

svn path=/trunk/; revision=54213
2011-10-20 14:53:02 +00:00
Timo Kreuzer b70536aa88 Make some eol-styles consistent for .sln and .vcproj and .cmd
svn path=/trunk/; revision=53997
2011-10-04 23:05:12 +00:00
Amine Khaldi 3b813c314d [CMAKE]
* Add PCH variable (disabled by default) to configure scripts.
* Add ccache variable to unix configure script.

svn path=/trunk/; revision=52866
2011-07-25 19:08:52 +00:00
Timo Kreuzer 2c426dbf82 [CMAKE]
Improve configure.cmd

svn path=/trunk/; revision=52569
2011-07-08 10:01:43 +00:00
Timo Kreuzer c83e44a670 [CMAKE]
Patch by Samuel Serapion:
Fix configure script and add support for CodeBlocks and Eclipse

svn path=/trunk/; revision=52474
2011-06-26 22:05:31 +00:00
Timo Kreuzer f8c949daa5 [CMAKE]
Patch by Samuel Serapion:
Make configure.cmd check for presence of cmake and detect jom

svn path=/trunk/; revision=52465
2011-06-26 09:19:24 +00:00
Amine Khaldi 9622e8516f [CMAKE]
* Add a way to use WDK headers (psdk, crt and ddk) instead of ours. To use it, just alter USE_WDK_HEADERS in configure.cmd to be 1 instead of 0.

svn path=/trunk/; revision=52439
2011-06-24 12:08:57 +00:00
Amine Khaldi 074d91351d [CMAKE]
* Disable ccache by default.

svn path=/trunk/; revision=52212
2011-06-13 13:46:50 +00:00
Amine Khaldi 4c941247b4 [CMAKE]
* Move cmake files to the cmake folder.
* Rename msc.cmake to msvc.cmake and toolchain-mingw32.cmake to toolchain-gcc.cmake.
* Add compilerflags.cmake to group macros that handle different compiler flags.
* Move add_linkerflag and set_unicode macros to compilerflags.cmake. They were duplicated in gcc.cmake and msvc.cmake.
* Add add_compiler_flags macro to handle CMAKE_C_FLAGS and CMAKE_CXX_FLAGS properly, and replace add_definitions calls with add_compiler_flags calls when we're adding compiler flags, not definitions.
* Reorganize gcc.cmake to have compiler flags then linking and compiling rules.
* Move CMAKE_ASM_COMPILE_OBJECT out of toolchain-gcc.cmake into gcc.cmake and add ${CMAKE_C_FLAGS} to it, now that flags are properly set.
* Don't pass <FLAGS> (compiler flags) when linking.
* Without the (commented out) linker script flag, CMAKE_SHARED_LINKER_FLAGS_INIT is the same for both i386 and amd64. Deduplicate it.
* Fix CMAKE_C_STANDARD_LIBRARIES comment.
* Use <FLAGS> in msvc CMAKE_ASM_COMPILE_OBJECT instead of manual includes.
* Don't set ntdllsys linker language to C, it's an asm lib.
* Remove ros_cd.cmake as it's not needed anymore.
* Define _CRT_SECURE_NO_WARNINGS when compiling host tools with msvc.

svn path=/trunk/; revision=52210
2011-06-13 10:36:40 +00:00
Jérôme Gardou cf2494a35b revert unwanted change
svn path=/trunk/; revision=52060
2011-06-02 12:29:11 +00:00
Jérôme Gardou 989c121257 [CMAKE]
fix pch support, with proper dependancies.
  Use cmake built-in functions instead of doing weird "magic" with tabs and spaces.
  According to gcc doc, if header.h is precompiled, the output should be named "header.h.gch" and not anything else.

svn path=/trunk/; revision=52058
2011-06-02 12:18:22 +00:00
Sylvain Petreolle de9bfefa63 Add cmake configure script for unix.
svn path=/trunk/; revision=51801
2011-05-16 21:26:08 +00:00
Timo Kreuzer fae2044a23 [CMAKE]
Integrate cmake stuff into trunk
Only files added.

svn path=/trunk/; revision=51783
2011-05-16 13:12:07 +00:00