Commit Graph

65 Commits

Author SHA1 Message Date
Aleric Inglewood
db7155666d Merge branch 'master' into meshupload
Conflicts:
	indra/cmake/00-Common.cmake

One diff added /MP to CMAKE_CXX_FLAGS_DEBUG while
another removed /arch:SSE2 from the same line.

Fixed to honor both changes.
2013-01-21 19:16:06 +01:00
Latif Khalifa
56542a02e8 Use multiple cores for compilation of the Debug build 2013-01-11 11:28:21 +01:00
Drake Arconis
5e71d9578f A bit of cleanup in preperation for VS2012 2012-11-30 11:17:10 -05:00
Siana Gearz
953a7ff066 Fix growth of linker flags on windows 2012-08-26 08:12:23 +02:00
Drake Arconis
8bfdc98ef4 Improvements!
Fixed Boost library to not throw warnings
Changed PNG cmake slightly
Updated 32lib package for correct locations
Cleaned up flags a bit for linux64
2012-07-19 17:44:19 -04:00
Drake Arconis
ccb914ea83 General cleanup of OSX support - not done
Updated with new cursors from LL
Corrected mispackaged OSX Libs
Corrected mouse flicker on menus

Signed-off-by: Drake Arconis <lightdrake@gmail.com>
2012-07-15 17:45:50 -04:00
Drake Arconis
edb144bd1d Fixed ugly workaround for compiler detection
Corrected ugly workaround for compiler detection in code with
correct definition in llpreprocessor.h and updated various #if
to reflect this.
2012-07-10 14:15:59 -04:00
Drake Arconis
cb0f4f8f10 Added support for Intel c++ Composer Xe
Added support for building with Intel C++ Composer Xe
Fixed a warning thrown by it
2012-07-08 10:29:28 -04:00
Drake Arconis
31ca817dc0 Removed ReleaseSSE2
Removed ReleaseSSE2 and moved its options under Release.
2012-07-04 10:25:04 +00:00
Drake Arconis
9db7bcde00 Why or why ugly hack :/ 2012-07-03 17:33:37 +00:00
Drake Arconis
fc3436a8d1 *grumble* 2012-07-03 04:48:30 +00:00
Drake Arconis
41983b7f27 A bit of cleanup and fixes 2012-07-03 04:45:53 +00:00
Drake Arconis
cb5474c291 Cleanup and simplication of cmake logic in 00-Common.cmake 2012-07-03 00:31:06 +00:00
Drake Arconis
d703b4e076 Further tweaking cmake 2012-07-02 21:04:53 +00:00
Drake Arconis
c464a8da30 Merge branch 'V2MultiWear' of bitbucket.org:Lirusaito/singularityviewer into AltCompilers
Conflicts:
	indra/cmake/00-Common.cmake
	indra/newview/llvovolume.cpp
2012-07-02 20:16:56 +00:00
Drake Arconis
ece9dda7b4 Initial support for the Clang compiler and numerous warning fixes 2012-07-02 19:45:41 +00:00
Shyotl
d0668d818c Cmake was setting a certain preprocessor definition when it shouldn't have been(Because I made a silly mistake). 2012-07-02 14:30:28 -05:00
Shyotl
67e1a3b004 Lindie viewer-dev catchup regarding rendering pipeline. 2012-06-30 20:05:31 -05:00
Siana Gearz
be9f3178c0 Fixies, missed files 2012-03-28 01:45:10 +02:00
Siana Gearz
f885c8667b This might be needed for OS X, Drake says 2012-03-20 06:41:10 +01:00
Siana Gearz
a632010b95 Boost: target Windows XP strictly 2012-02-23 15:35:50 +01:00
Drake Arconis
665569dfc7 I forgot why I made these. 2012-02-19 17:07:42 -05:00
Siana Gearz
a3a7f72b7c Limit PCH size sanely 2012-02-09 15:22:07 +01:00
Siana Gearz
2ef5673c18 Let's not segfault Lenny's GCC 2012-02-09 02:10:21 +01:00
Siana Gearz
c6ce417fac Attempt at fixing a Linux build botch in ReleaseSSE2 2011-12-29 13:39:59 +01:00
Siana Gearz
23b97efb69 Prebuilt fetch now honors CMake-specified plattform 2011-12-25 05:21:37 +01:00
Siana Gearz
2c8e3bb0a3 More Linux build fixes 2011-12-25 04:28:17 +01:00
Siana Gearz
a57ac5a954 Make OpenJPEG respect our build settings 2011-12-23 23:23:55 +01:00
Siana Gearz
5f4328767b Debug needs SSE2 now too 2011-08-07 22:40:36 +02:00
Siana Gearz
45c87257ed Debug build fixes, linux32 2011-08-02 01:13:53 +02:00
Siana Gearz
aa469d860f Merge branch 'V2Mesh' of https://github.com/Shyotl/SingularityViewer into future 2011-08-01 19:56:33 +02:00
Shyotl
b258b71e07 Flipped the MESH_ENABLED switch. Added missing components and updated stuff to be closer to mesh-development head. 2011-07-30 20:30:07 -05:00
Siana Gearz
bad84aa608 Merge branch 'master' of git://github.com/siana/SingularityViewer 2011-07-12 21:40:02 +02:00
Siana Gearz
317b8d4ca1 OSX build changes 2011-07-12 21:39:51 +02:00
Aleric Inglewood
0e8be5ff43 Never set -march on STANDALONE. 2011-06-30 03:16:52 +02:00
Siana Gearz
adeba18356 GCC 4.6 fixes 2011-05-16 01:37:00 +02:00
Siana Gearz
e2e576e550 Merge git://github.com/AlericInglewood/SingularityViewer
Conflicts:
	indra/newview/skins/default/xui/en-us/mime_types.xml
2011-05-08 19:39:32 +02:00
Siana Gearz
eedc1f79ec Resolve stray VC8 CRT dependency by updating libs 2011-05-05 03:20:54 +02:00
Aleric Inglewood
b7aaef7e91 Set appropriate compiler options for x86_64.
Using -march=pentium4 break compilation on 64bit.
A pentium isn't a 64bit cpu.
The used options were copied from imprudence.
2011-05-02 15:15:23 +02:00
Aleric Inglewood
26c40255aa Remove CR from configuration, source and xml files. 2011-05-01 22:16:05 +02:00
siana
611b8f48d6 VC10 fixes 2011-03-21 03:13:49 +01:00
siana
15c01ed310 Merge remote branch 'shyotl/V2Renderer'
Conflicts:
	indra/cmake/00-Common.cmake
2011-03-20 04:55:56 +01:00
siana
3b567d3eae VC10 transition, Webkit 4.7.1 2011-03-18 01:33:47 +01:00
Shyotl
77b5ac28e6 Oh cmake. You so silly. VS2010 wchar_t fix 2011-03-17 00:37:18 -05:00
Siana Gearz
5882ea5643 Better RelWithDebInfo flags on Linux 2011-03-15 16:24:11 +01:00
siana
36339d2fba Saner compiler flags, hopefully 2011-02-20 23:07:33 +01:00
Siana Gearz
8c02c2bb08 Compile flags 2011-02-16 20:22:45 +01:00
siana
784ef47048 Tag, settings 2010-12-26 01:53:36 +01:00
Siana Gearz
6ccd85d42f Build adjustments, mac fixed? 2010-11-28 20:32:24 +01:00
Siana Gearz
1a1a43ecc3 VC10 detection 2010-11-27 18:02:01 +01:00