Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,304 Commits 20 Branches 51 Tags
08db85fa99fce840096de6181d1e0c42ce35fdbc
Commit Graph

284 Commits

Author SHA1 Message Date
Shyotl
08db85fa99 Unused assets can DIAF. 2014-12-18 23:17:03 -06:00
Shyotl
e57bcea3b6 Experimentation with msbuild 12.0 2014-12-18 18:26:21 -06:00
Shyotl
44f8f17763 V3 merge for most python scripts. fmod inclusion/linkage/packaging changes. 2014-12-18 18:01:41 -06:00
Shyotl
32706065ac Have CopyWinLibs only copy files needed for current configuration. 2014-12-12 03:49:47 -06:00
Shyotl
958031dbaf Moved build dirs out of indra directory. installed.xml and prebuilts are now per-build-target. Added support for v3 prebuilt package layout. 2014-12-03 22:36:42 -06:00
Shyotl
c2abbaedc8 Merge branch 'master' of https://Shyotl@bitbucket.org/LightDrake/singularityviewer-internal.git into FMODStudio 2014-11-22 22:20:32 -06:00
Lirusaito
bd94e2ae73 Linux64 library update! (other platforms to come) 
Curl 7.38
LibPNG 1.6.13
LLQTWebkit 4.8.6
OpenSSL 1.0.1j (Yep, this fixes POODLE)

Libraries provided by Alchemy Viewer.
 2014-10-21 05:41:44 -04:00
Drake Arconis
eb96dee176 Murrrrge 2014-09-10 01:03:04 -04:00
Shyotl
eb910b0bae Use /Zm140 for all windows builds. 2014-08-23 20:50:56 -05:00
Drake Arconis
948ebe5213 All your codebase are belong to us. 2014-08-22 00:15:09 -04:00
Drake Arconis
90d2dce07a Add FMOD Studio support 2014-08-10 17:41:10 -04:00
Latif Khalifa
ffd0e6b79d [Branding] Linux scripts now made from template by cmake 2014-06-18 18:35:29 +02:00
Latif Khalifa
8497ba1898 Use @style@ cmake escapes for the linux wrapper script 
This avoids cmake messing up shell variables
 2014-05-27 17:39:37 +02:00
Latif Khalifa
1dbd913d9d Branding: generate wrapper script with cmake 2014-05-25 18:18:47 +02:00
Siana Gearz
1c521a3743 Merge branch 'master' of https://github.com/lkalif/SingularityViewer 2014-05-09 22:18:10 +02:00
Siana Gearz
484108dafc Fix VS2012 64-bit debug build 2014-05-09 22:14:47 +02:00
Latif Khalifa
08a23de051 Restore compiler warnings flags. 
Previous work on enabling the build on the latest Mac OS and
Xcode compiler mistakenly took out compiler warning flags.

This restores previously used flags.

Issue noticed by Sovereign Engineer.
 2014-04-30 07:29:23 -07:00
Latif Khalifa
42ca1a8994 [clang] Force build with SDK 10.6 2014-04-16 10:55:36 +02:00
Latif Khalifa
db678238ef Merge branch 'master' into osx_xcode5 2014-04-16 09:56:57 +02:00
Latif Khalifa
41eafa4ede [xcode5] WIP: build system changes 2014-04-14 21:14:42 +02:00
Latif Khalifa
bb9a958a1e [Voice Update] Update SLVoice prebuilds and packaging script 2014-03-12 22:50:43 +01:00
Latif Khalifa
85c875e856 Link boost dynamically, bundle its libs. Addresses issue 1152. 
Rebuild collada to also use dynamic boost.
SV-1152 #close Fixed by linking boost dynamically
 2013-12-20 03:02:17 +01:00
Inusaito Sayori
b22cc2c2fa [Warnings] Fixed warning: "_FORTIFY_SOURCE" redefined [enabled by default] 2013-12-14 00:05:10 -05:00
Latif Khalifa
c99f54367d Use viewer channel as the basis for installer file names 2013-11-19 00:50:06 +01:00
Latif Khalifa
cce3809a26 Autogenerate version numbers on Mac too 2013-11-19 00:28:05 +01:00
Latif Khalifa
7183797e05 Autogenerated versioned windows resource files 2013-11-19 00:12:34 +01:00
Drake Arconis
7fa5abd4d1 Added NVAPI support on windows 2013-11-16 14:01:09 -05:00
Drake Arconis
e1356b7aaf Fix slight breakage in the osx cmake 2013-11-03 23:00:56 -05:00
Drake Arconis
1553a90ebb Merged master 2013-11-03 20:15:41 -05:00
Latif Khalifa
822b728adb Only build Quicktime on 32 bit Windows 
Helps address issue 1180
 2013-11-03 00:32:01 +01:00
Latif Khalifa
2c1512dcbe Try finding FMOD Ex from registry intall path instead of hard coded location 2013-10-28 20:38:51 +01:00
Latif Khalifa
f4f4a39c01 Revert accidental removal of tcmalloc for 32 bit 2013-10-24 09:53:51 +02:00
Latif Khalifa
f545952136 Copy vc++ runtime libs, ignore size_t related warnings in the release build on win64 2013-10-22 11:25:32 +02:00
Latif Khalifa
22db8f56f1 WIP[win64]: installer 2013-10-22 00:59:26 +02:00
Latif Khalifa
73e1a9ad78 WIP[win64]: we haz 64 bit webkit 2013-10-21 20:42:31 +02:00
Latif Khalifa
17c59f25f5 WIP[win64]: it builds, runs. webkit disabled in cmake for now 2013-10-20 17:03:48 +02:00
Latif Khalifa
32bed5660a WIP win64 support 2013-10-19 23:05:53 +02:00
Drake Arconis
010723eea6 Merge branch 'master' of https://github.com/LightDrake/SingularityViewer 2013-10-07 23:24:04 -04:00
Drake Arconis
a4fa66655e Unbreak OSX Make File builds 2013-10-07 23:23:51 -04:00
Drake Arconis
008eac5a8d Merge branch 'master' of https://github.com/LightDrake/SingularityViewer 2013-10-07 17:46:37 -04:00
Latif Khalifa
7aed929af5 Attempted fix in Linux build and Linux32 packaging 2013-10-07 15:11:54 +02:00
Drake Arconis
817c01595f I really really hate you microsoft. More windows sdk cmake poke 2013-10-06 22:55:21 -04:00
Drake Arconis
128503fd7f Attempt to fix linking issues 2013-10-06 22:54:38 -04:00
Sean Devin
cf100fc36c Do not use pcre on linux64 
Conflicts:
	indra/newview/viewer_manifest.py

Merged with a patch that I wrote.

The linux pcre prebuilts can also be removed from install.xml,
but for now leaving them there because the prebuilts are still
in use by the libcollada prebuilt (probably should just move
them into that git repository).
 2013-10-06 21:56:11 +02:00
Aleric Inglewood
64513e7229 Fix boost upgrade for standalone 2013-10-06 19:42:58 +02:00
Aleric Inglewood
8262e899f8 Merge remote-tracking branch 'singu/master' 2013-10-06 17:11:58 +02:00
Latif Khalifa
a1c43e3539 Fixed mac build. How the heck did this get there? 2013-10-06 16:34:56 +02:00
Aleric Inglewood
cfad646748 Removed left over debug output. 2013-10-06 11:54:11 +02:00
Latif Khalifa
85f4fa9000 Merge branch 'boost152' 2013-10-06 08:13:31 +02:00
Latif Khalifa
9f0af64963 More boosted fun 2013-10-06 01:55:12 +02:00