Skip to content

Precompiled header proposal #5

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

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

Precompiled header proposal #5

Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
52fc82f
sconsProject: added precompiled header feature (to check)
edubois Feb 1, 2012
268c10b
sconsProject: improvment on precompiled header path
edubois Feb 1, 2012
2db29df
sconsProject: disabled WIN64 constant.
edubois Feb 2, 2012
b704ffe
sconsProject: gcc compilation fixes.
edubois Feb 2, 2012
8bc4d4e
Merge branch 'master' into precompiled_header_proposal
edubois Mar 22, 2012
b069a9d
Merge branch 'master' of github.com:tuttleofx/sconsProject into preco…
edubois Mar 22, 2012
0308ee9
Merge branch 'master' into precompiled_header_proposal
edubois Apr 1, 2012
1f0103a
sconsProject: added qtmain.py (windows non console application).
edubois Apr 12, 2012
7dcbd18
sconsProject: added qtmain.py and some fixes
edubois Apr 13, 2012
2bb8524
sconsProject: fixed wrong merge.
edubois Apr 13, 2012
876d246
qtmain: unix compatibility
edubois Apr 28, 2012
63d7039
Merge branch 'master' into precompiled_header_proposal
edubois Jul 4, 2012
322bd0c
Merge branch 'precompiled_header_proposal' of git://github.com/tuttle…
edubois Jul 4, 2012
08d679a
sconsProject update for precompiled headers.
edubois Jul 5, 2012
2bc6d3c
Merge branch 'master' of git://github.com/tuttleofx/sconsProject into…
edubois Nov 11, 2012
6657204
Merge branch 'master' of git://github.com/tuttleofx/sconsProject into…
edubois Nov 13, 2012
f9c10a8
sconsProject: added /bigobj for visual C++ higher dlls' segments size.
edubois Nov 13, 2012
516da79
Merge branch 'master' of git://github.com/tuttleofx/sconsProject into…
edubois Nov 13, 2012
fa869ec
Merge branch 'precompiled_header_proposal' of git://github.com/tuttle…
edubois Nov 13, 2012
13fcd2c
Merge branch 'master' of git://github.com/tuttleofx/sconsProject into…
edubois Nov 13, 2012
d36c10a
Merge branch 'precompiled_header_proposal' of git://github.com/tuttle…
edubois Nov 13, 2012
89ef26c
Merge branch 'master' of git://github.com/tuttleofx/sconsProject into…
edubois Nov 17, 2012
9ce303c
Merge branch 'precompiled_header_proposal' of git://github.com/tuttle…
edubois Nov 17, 2012
265cdf2
Merge branch 'precompiled_header_proposal' of git://github.com/tuttle…
edubois Nov 18, 2012
f720767
Merge branch 'master' into precompiled_header_proposal
edubois Apr 26, 2013
382b56e
Merge branch 'master' into precompiled_header_proposal
edubois Apr 26, 2013
be912ec
Merge branch 'master' of git://github.com/tuttleofx/sconsProject into…
edubois Apr 29, 2013
b04220e
sconsProject: added multithreaded_static_lib to compile with /MT (vc+…
edubois May 21, 2013
afa65e3
sconsProject: some improvments
edubois May 27, 2013
9fa61cf
Merge branch 'precompiled_header_proposal' of git://github.com/tuttle…
edubois May 27, 2013
5914e52
Merge branch 'master' of git://github.com/tuttleofx/sconsProject into…
edubois May 27, 2013
f9dad5d
Merge branch 'precompiled_header_proposal' of git://github.com/tuttle…
edubois May 27, 2013
f650b2a
Merge branch 'master' of git://github.com/tuttleofx/sconsProject into…
edubois Jul 9, 2013
2bb84c6
Merge branch 'precompiled_header_proposal' of git://github.com/tuttle…
edubois Jul 9, 2013
7ab39b8
sconsProject: experimental branch comments
edubois Jul 9, 2013
c894a5b
Merge branch 'master' into precompiled_header_proposal
edubois Oct 29, 2013
a7fcc3a
sconsProject: qt5 compilation.
edubois Nov 5, 2013
97c2111
sconsProject: fixed compilation issues
edubois Dec 9, 2013
dc422ca
Added CC['wchar'] option because Qt5 binaries are compiled with /Zc:w…
edubois Dec 27, 2013
c1454d9
Fixed scons compilation issue on Windows.
edubois Dec 27, 2013
78b2b4f
Minor fix
edubois Dec 27, 2013
d9d06b6
Merge remote-tracking branch 'origin/HEAD' into precompiled_header_pr…
edubois Jan 28, 2014
a7fc9d3
Merge branch 'precompiled_header_proposal' of git://github.com/tuttle…
edubois Jan 28, 2014
e1f068e
sconsProject: added option to override shared library suffix, which i…
edubois May 8, 2014
7eafdd0
sconsProject: added an option to specify ranlib and ar binaries (usef…
edubois May 8, 2014
e1e0713
Merge branch 'master' of git://github.com/tuttleofx/sconsProject into…
edubois May 8, 2014
c5f665c
sconsProject: added ncurses libraries (ncurses and CDK framework)
edubois Nov 30, 2014
d806e49
Merge branch 'master' into precompiled_header_proposal
edubois Nov 30, 2014
84d08ce
sconsProject: ncurses updates.
edubois Nov 30, 2014
64792a8
sconsProject: added fmod.
edubois Nov 30, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
sconsProject: fixed wrong merge.
  • Loading branch information
@edubois
edubois committed Apr 13, 2012
commit 2bb8524b3d2c7e050bcd39fcacbe75cb69ac385f
6 changes: 0 additions & 6 deletions autoconf/qtmain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
<<<<<<< HEAD
from _external import *

qtmain = LibChecker( 'qtmain' )
=======
from _external import *

qtmain = LibChecker( 'qtmain' )
>>>>>>> 1f0103ab5e943b5a5d470c93e5b56ea724ea2b84