Commit Graph

368 Commits

Author SHA1 Message Date
Drake Arconis
01bf430b1a Get linux64 somewhat working 2016-01-19 10:07:27 -08:00
Drake Arconis
a75ed131b7 Fix up more prebuilt issues 2016-01-19 01:47:58 -05:00
Drake Arconis
ae0ad8af92 Fix up some prebuilt names 2016-01-19 01:44:28 -05:00
Drake Arconis
eef327f18b Remove BerkeleyDB 2016-01-19 01:40:52 -05:00
Drake Arconis
78561d7ac7 Link LLCommon as static 2016-01-17 23:32:02 -05:00
Drake Arconis
0824055b29 Remove ELFIO 2016-01-17 11:45:35 -05:00
Drake Arconis
8a6bb4c00a Add options for LTO and Incremental Linking for windows 2016-01-17 08:19:17 -05:00
Drake Arconis
24b570d89c Add flag to use quicktime prebuilt 2016-01-16 18:51:29 -05:00
Drake Arconis
58e08a972d Get windows 64-bit building 2016-01-16 18:50:38 -05:00
Drake Arconis
615fe30ba8 Minor cmake cleanup 2016-01-16 17:03:04 -05:00
Drake Arconis
a17b849d84 Manifest for windows 10 2016-01-16 16:39:36 -05:00
Drake Arconis
d219087950 Remove llqtwebkit, add cef 2016-01-16 16:14:04 -05:00
Drake Arconis
1d2995666f Remove FMOD Ex 2016-01-16 13:07:51 -05:00
Drake Arconis
e8ec5d750c Hacks to get fmod working for now 2016-01-16 12:49:35 -05:00
Drake Arconis
f36d4eb03a Installer rework WIP 2016-01-16 12:49:25 -05:00
Drake Arconis
e9f4b917d1 Fix up icon copying and make manifest actually start to kinda work again 2016-01-16 11:18:40 -05:00
Drake Arconis
13666ac62a Change out versioning code for less hacky versioning code 2016-01-16 10:06:07 -05:00
Drake Arconis
2f2e1fbe8f Major breaking changes 2016-01-16 08:05:47 -05:00
Siana Gearz
dc1efa8a05 Fix develop.py for cygwin invocation 2015-02-23 00:35:43 +01:00
Shyotl
91b6d68eae Avoid unix-based mkdir usage on windows. 2015-01-29 04:03:45 -06:00
Shyotl
a0487b12be FMOD Studio prebuilt update for OSX. Also, delete "autobuild-package.xml" that is in newer v3-based prebuilt packages, and prevent registry key from trumping usage of fmodstudio prebuilt; it must now be explicitly set in the develop.py invocation. 2015-01-29 00:55:08 -06:00
Shyotl
b865b92a6a Merge branch 'FMODStudio'
Conflicts:
	indra/cmake/PNG.cmake
	indra/newview/llnetmap.cpp
	indra/newview/llviewermessage.cpp



PARAMETERS: CLEAN
2015-01-26 17:15:46 -06:00
Shyotl
6e4ef6f8a1 I'll have all the derps, please. 2015-01-23 16:49:21 -06:00
Shyotl
56bd48bd2a elseif (WINDOWS AND WORD_SIZE EQUAL 32)' mistakenly clobbered. Also, try 'ProgramFiles(x86)' envvar first 2015-01-23 02:07:19 -06:00
Shyotl
ca98523c41 Cmake version bump, cleanup, typo fixes, rewrite of fmodex.cmake. 2015-01-22 02:39:45 -06:00
Shyotl
b808caaa0e Appease cmake 3.1.0 2015-01-09 21:38:27 -06:00
Shyotl
2678d0f99e Trying fmodstudio as a prebuilt. (pushed to test on linux buildserver) 2015-01-08 00:49:42 -06:00
Shyotl
b1954e411b Nice typos. 2015-01-08 00:46:36 -06:00
Shyotl
a891d2fdea FMOD(STUDIO|EX)_SDK_DIR wasn't being properly set. Change fallback on missing msvc*, as the old code made no sense (wildcarded paths don't throw when not found) 2014-12-29 18:59:15 -06:00
Shyotl
2d2513369a OSX poking. 2014-12-28 00:20:30 -06:00
Shyotl
f5d3bc2b7b Fixed CMP0026 properly. Requires cmake 2.8.8+ 2014-12-26 23:53:14 -06:00
Shyotl
b3bd91877c Fixed CMP0048 properly. 2014-12-26 23:51:05 -06:00
Shyotl
e0fb73414b Mac fixup. 2014-12-22 02:08:18 -06:00
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
Inusaito Sayori
18f640d73d Fix Linux linker errors
Patch by Aleric
2014-12-05 12:52:01 -05: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