Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,147 Commits 20 Branches 51 Tags
3abc778f2cf0fb8a6a0f46b742fa4e96bf9cace0
Commit Graph

66 Commits

Author SHA1 Message Date
Siana Gearz
8227efcaf1 Make our build and packaging shine again 2011-05-09 13:35:51 +02:00
Siana Gearz
e371c2e93d Repo cleanup. Sheesh, who packaged pics with a lib? 2011-05-09 00:40:38 +02:00
Siana Gearz
8d2b56b1eb Fixed prebuilt fetching, Snowglobe style 2011-05-08 23:25:21 +02:00
Shyotl
1a099167ae Fixing Win compile. (Partial) 2011-05-08 20:34:32 +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
f2199a504b More various small, old patches. 
Updated source tree to include everything I did
up till 2010-11-09.

Still to add: IMP-590, IMP-701, IMP-734, IMP-735 and IMP-702.
 2011-05-04 19:48:16 +02:00
Aleric Inglewood
ccaa494e85 Updated doc/contributions.txt and added various missing patches from imprudence. 
This updates the source tree with patches that I committed to
imprudence up till and including 2010-10-19.
 2011-05-04 15:52:25 +02:00
Aleric Inglewood
6848c2df6f Fix underlinkage of libmedia_plugin_webkit.so 
Fixed by updating indra/cmake/WebKitLibPlugin.cmake with
version from imprudence.

This commit also contains removal of execute permissions
of source files and configure files, sorry...
 2011-05-02 23:13:15 +02:00
Aleric Inglewood
c0c786b39f Make loading prebuilts work. 
Copied indra/cmake/Prebuilt.cmake from imprudence,
which fixed this issue.
 2011-05-02 20:50:26 +02:00
Aleric Inglewood
094587aefd Make viewer compile on standalone linux x86_64 
This involves making libllcommon shared, a change
that was not finished for windows/Mac.
More changes are needed to indra/newview/viewer_manifest.py
for those two operating systems, as well as to
indra/copy_win_scripts.

I did not test this on linux 32bit, nor non-standalone
on that OS, either.

I did not check voice (which will very likely not work
anyway on 64bit). And currently the webkit plugin doesn't
work for me, but I'll fix that in a different commit.
 2011-05-02 19:40:33 +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
b5a0d80cd7 Merge remote-tracking branch 'origin/master' 2011-05-02 04:39:29 +02:00
Aleric Inglewood
9bcc08df1a Don't barf when Google PerfTools are not found, but simply disable it. 
Plus bug fix (missing NOT): in the case that USE_GOOGLE_PERFTOOLS
is not set we DON'T want to build with Google TCMalloc.
 2011-05-02 04:36:47 +02:00
Siana Gearz
2ba1dbf9da Unbotch Aleric 2011-05-01 23:04:18 +02:00
Aleric Inglewood
26c40255aa Remove CR from configuration, source and xml files. 2011-05-01 22:16:05 +02:00
Aleric Inglewood
7edb98743d Add missing cmake/FindLLQtWebkit.cmake 2011-05-01 22:04:28 +02:00
Aleric Inglewood
6b8a12dd06 Rename FindZLIB.cmake to FindMyZLIB.cmake to avoid cmake warning. 2011-05-01 22:01:02 +02:00
tmac@latestevidence.com
af203533b3 Spell check added 2011-04-23 18:08:59 -04:00
siana
d4b6ece24b Unbotch jsoncpp 2011-03-21 04:17:00 +01: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
472dade93a More build/package fixes 2011-03-19 00:14:20 +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 Gearz
633b6d22f2 Emerald Local Assets 2011-03-03 03:30:58 +01:00
siana
31b3c8e755 Singularity 1.5.4(2) fixes 2011-02-21 15:15:55 +01:00
siana
36339d2fba Saner compiler flags, hopefully 2011-02-20 23:07:33 +01:00
siana
4069151bc2 llqtwebkit 1.6, static apr on windows 2011-02-20 04:11:05 +01:00
Siana Gearz
34e7773be3 Merge remote branch 'shyotlsv/master' 2011-02-16 21:05:57 +01:00
Siana Gearz
8c02c2bb08 Compile flags 2011-02-16 20:22:45 +01:00
Shyotl
000f102722 Backwards compatability for pre VC9 installs lacking updated resource compiler. (Uses pre-vista icon format) 
To support newer icon with VC8:
 -Replace VC/bin/rcdll.dll with newer from Windows SDK 7.0
 -Run develop.py with -DVISTA_ICON:BOOL=ON setting
 2011-02-15 17:17:45 -06:00
Shyotl
dfc99b4165 Resolved header conflict between linux/darwin/win32 by moving ares and curl headers relevant target subdirectories. 
Stemmed around the downloaded archives having differing headers and overwriting eachother.
 2011-02-15 04:11:47 -06:00
narv
12fded401e Build with GCC 4.2 on Darwin 2011-02-02 15:17:31 -07:00
Siana Gearz
77fc0e82c8 Linux version 2011-01-04 02:00:25 +01:00
Siana Gearz
037593aa99 Google tcmalloc 2011-01-01 02:56:41 +01:00
siana
784ef47048 Tag, settings 2010-12-26 01:53:36 +01:00
Siana Gearz
1d6bb3f3ea Fixed web browser thanks to ArminW/Imprudence 2010-12-24 22:23:32 +01:00
siana
80fe022718 Newer webkit plugin 2010-12-24 01:50:05 +01:00
siana
aff58d0ab9 Unbroke Windows build (vc9 compat only) 2010-12-19 03:35:24 +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
Siana Gearz
d68736da39 Put in some changes along sg1.4 dev history. 2010-11-21 15:57:44 +01:00
Shyotl
340ad7f4b8 Fixed cmake errors preventing generation of windows solution 
-Resolved merge errors in cmake CopyWinLibs.cmake
-Added CMAKE_C_FLAGS_RELEASESSE2 for windows target. Required for llimage in Singularity
 2010-11-17 20:47:12 -06:00
Siana Gearz
c1c2f65b12 Integrated OpenJPEG 1.4 2010-11-17 02:39:27 +01:00
Siana Gearz
e6806f3b16 Branding pt2 2010-11-15 10:45:16 +01:00
Siana Gearz
9dffb18c25 ld.gold on linux, useless spam 2010-11-13 04:45:10 +01:00
Siana Gearz
17a0d13b0c Merge shyotl, setting include broken (disabled) 2010-11-09 15:14:34 +01:00
unknown
4929460c66 COA stuff rolled into gSavedSettings. 
Added common script<->client command junk.
 2010-10-19 18:50:47 -05:00