Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Precompiled header proposal #5

Open
wants to merge 50 commits into
base: master
Choose a base branch
from
Open

Precompiled header proposal #5

wants to merge 50 commits into from

Conversation

fabiencastan
Copy link
Member

No description provided.

edubois added 30 commits February 1, 2012 18:55
@edubois
sconsProject: added precompiled header feature (to check)
52fc82f
@edubois
sconsProject: improvment on precompiled header path
268c10b
@edubois
sconsProject: disabled WIN64 constant.
2db29df
@edubois
sconsProject: gcc compilation fixes.
b704ffe
@edubois
Merge branch 'master' into precompiled_header_proposal
8bc4d4e
@edubois
Merge branch 'master' of github.com:tuttleofx/sconsProject into preco…
b069a9d 
…mpiled_header_proposal
@edubois
Merge branch 'master' into precompiled_header_proposal
0308ee9
@edubois
sconsProject: added qtmain.py (windows non console application).
1f0103a
@edubois
sconsProject: added qtmain.py and some fixes
7dcbd18
@edubois
sconsProject: fixed wrong merge.
2bb8524
@edubois
qtmain: unix compatibility
876d246
@edubois
Merge branch 'master' into precompiled_header_proposal
63d7039 
Conflicts:
	__init__.py
@edubois
Merge branch 'precompiled_header_proposal' of git://github.com/tuttle…
322bd0c 
…ofx/sconsProject into precompiled_header_proposal
@edubois
sconsProject update for precompiled headers.
08d679a
@edubois
Merge branch 'master' of git://github.com/tuttleofx/sconsProject into…
2bc6d3c 
… precompiled_header_proposal
@edubois
Merge branch 'master' of git://github.com/tuttleofx/sconsProject into…
6657204 
… precompiled_header_proposal
@edubois
sconsProject: added /bigobj for visual C++ higher dlls' segments size.
f9c10a8
@edubois
Merge branch 'master' of git://github.com/tuttleofx/sconsProject into…
516da79 
… precompiled_header_proposal
@edubois
Merge branch 'precompiled_header_proposal' of git://github.com/tuttle…
fa869ec 
…ofx/sconsProject into precompiled_header_proposal
@edubois
Merge branch 'master' of git://github.com/tuttleofx/sconsProject into…
13fcd2c 
… precompiled_header_proposal
@edubois
Merge branch 'precompiled_header_proposal' of git://github.com/tuttle…
d36c10a 
…ofx/sconsProject into precompiled_header_proposal
@edubois
Merge branch 'master' of git://github.com/tuttleofx/sconsProject into…
89ef26c 
… precompiled_header_proposal
@edubois
Merge branch 'precompiled_header_proposal' of git://github.com/tuttle…
9ce303c 
…ofx/sconsProject into precompiled_header_proposal
@edubois
Merge branch 'precompiled_header_proposal' of git://github.com/tuttle…
265cdf2 
…ofx/sconsProject into precompiled_header_proposal
@edubois
Merge branch 'master' into precompiled_header_proposal
f720767 
Conflicts:
	__init__.py
@edubois
Merge branch 'master' into precompiled_header_proposal
382b56e
@edubois
Merge branch 'master' of git://github.com/tuttleofx/sconsProject into…
be912ec 
… precompiled_header_proposal

Conflicts:
	__init__.py
@edubois
sconsProject: added multithreaded_static_lib to compile with /MT (vc+…
b04220e 
…+ only)
@edubois
sconsProject: some improvments
afa65e3 
* deal with "path too long" issues (disabled until it works)
* qt.py updated solving moc.exe that generates too long include paths
* qt.py updated to deal with translations
@edubois
Merge branch 'precompiled_header_proposal' of git://github.com/tuttle…
9fa61cf 
…ofx/sconsProject into precompiled_header_proposal
@fabiencastan
Copy link
Member Author

It would be interesting to merge this branch with many interesting things, but I noticed few things to fix.

@edubois Could you fix that?
@mfe Could you check this branch with TuttleOFX on windows ?

@edubois
Copy link
Member

edubois commented Jun 18, 2013

Ok, I am taking your notes in consideration, I will try to fix that as soon
as possible, during the next week.

I am using this branch every weeks without any issues, but concerning the
precompiled headers, there is some work to do to make the code cleaner.

Thank you for your reading.
-Eloi.

2013/6/18 Fabien Castan [email protected]

It would be interesting to merge this branch with many interesting things,
but I noticed few things to fix.

@edubois https://github.com/edubois Could you fix that?
@mfe https://github.com/mfe Could you check this branch with TuttleOFX
on windows ?

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/5#issuecomment-19641383
.

*Eloi du Bois
*

@fabiencastan
Copy link
Member Author

Thanks !

@mfe
Copy link
Member

mfe commented Jun 19, 2013

Ok, I'll test asap.

@mfe mfe closed this Jun 19, 2013
@mfe mfe reopened this Jun 19, 2013
edubois added 14 commits July 9, 2013 21:28
@edubois
Merge branch 'master' of git://github.com/tuttleofx/sconsProject into…
f650b2a 
… precompiled_header_proposal
@edubois
Merge branch 'precompiled_header_proposal' of git://github.com/tuttle…
2bb84c6 
…ofx/sconsProject into precompiled_header_proposal
@edubois
sconsProject: experimental branch comments
7ab39b8 
* added comments for win32 commands spawn
* added comments for qt.py include simplifier
@edubois
Merge branch 'master' into precompiled_header_proposal
c894a5b
@edubois
sconsProject: qt5 compilation.
a7fcc3a
@edubois
sconsProject: fixed compilation issues
97c2111 
* Fixed issue with qt5 on MACOSX using framework: library where added with -lQtCore and -framework QtCore
* Fixed issue with qt5 that was making modules dependencies wrongly added
* Fixed issue with poco libraries
@edubois
Added CC['wchar'] option because Qt5 binaries are compiled with /Zc:w…
dc422ca 
…char_t- option
@edubois
Fixed scons compilation issue on Windows.
c1454d9
@edubois
Minor fix
78b2b4f
@edubois
Merge remote-tracking branch 'origin/HEAD' into precompiled_header_pr…
d9d06b6 
…oposal
@edubois
Merge branch 'precompiled_header_proposal' of git://github.com/tuttle…
a7fc9d3 
…ofx/sconsProject into precompiled_header_proposal
@edubois
sconsProject: added option to override shared library suffix, which i…
e1f068e 
…s useful when cross-compiling (eg. android).

* name of the option: SHLIBSUFFIX
@edubois
sconsProject: added an option to specify ranlib and ar binaries (usef…
7eafdd0 
…ul for android compilation)
@edubois
Merge branch 'master' of git://github.com/tuttleofx/sconsProject into…
e1e0713 
… precompiled_header_proposal

Conflicts:
	__init__.py
fabiencastan
fabiencastan reviewed May 9, 2014
View reviewed changes
tools/qt.py
@@ -270,6 +293,10 @@ def generate(env):
QT_MOCCXXPREFIX = '',
QT_MOCCXXSUFFIX = '.moc',
QT_UISUFFIX = '.ui',
QT4_LUPDATE = os.path.join('$QT_BINPATH','lupdate'),
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is common for Qt3, Qt4 and Qt5.
So the name should be QT_LUPDATE instead of QT4_LUPDATE, no?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe, yes, this needs more tests.

That's something I can try today.

2014-05-09 14:15 GMT+02:00 Fabien Castan [email protected]:

In tools/qt.py:

@@ -270,6 +293,10 @@ def generate(env):
QT_MOCCXXPREFIX = '',
QT_MOCCXXSUFFIX = '.moc',
QT_UISUFFIX = '.ui',

  •            QT4_LUPDATE = os.path.join('$QT_BINPATH','lupdate'),

This file is common for Qt4 and Qt5.
So the name should be QT_LUPDATE instead of QT4_LUPDATE, no?

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/5/files#r12472829
.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@fabiencastan @edubois @mfe