Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,886 Commits 20 Branches 51 Tags
71b0c35653cfdc19bc89bb0d2bd03e09c69fb4ec
Commit Graph

149 Commits

Author SHA1 Message Date
Siana Gearz
23b34aeb92 Fix FMOD Ex packaging 2012-08-19 19:04:22 +02:00
Drake Arconis
1e81966b89 Clean up and updates 
Cleaned up header bloatyness in linden_common
Moved around things to be in line with Linden Lab
Updated llinitparam and imported its new dependencies
Removed dohexeditor and related files
Removed unused legacy files

             /\_..._/\
             |/ \_/ \|
             | o.-.o |
             \ ( O ) /
             /'--U--'\
             |  .:.  | /\
             | /:;:\ |` /
   Drake     | |:;:| |-'
  Arconis   /  |'-'|  \
            `""`   `""`
 2012-07-20 08:13:07 -04: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
92a5b14347 Linux64 libs and fixes 2012-07-16 16:10:15 -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
0316b7ff9a OSX libwork 
Started on osx libwork will need darwin builder to test
 2012-07-14 04:10:09 -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
Siana Gearz
d1b6b78206 Fixing windows build 2012-07-05 22:38:24 +02:00
Drake Arconis
d238cfe753 LibraryWork: Windows Libraries 
Repacked the windows libraries for new package layout.
Cleaned install.xml of unused libraries on windows.
Cleaned install.xml of unused libraries on darwin.
Repacked windows gperftools from Kitty/Catznip.
Updated windows openal.
 2012-07-05 02:08:27 +00:00
Drake Arconis
31ca817dc0 Removed ReleaseSSE2 
Removed ReleaseSSE2 and moved its options under Release.
 2012-07-04 10:25:04 +00:00
Drake Arconis
5748de1f9d More changes for lib and packaging update 2012-07-04 04:41:33 +00:00
Drake Arconis
d0c1c4d753 Dos2Unix line endings and a file mode change 2012-07-04 00:29:59 +00:00
Drake Arconis
7af331c50d First set of changes for new librarys and lib layout support! 
Modified repackage script to support new layout
Fixed webkit to work against new llqtwebkit
 2012-07-04 00:26:42 +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
f05edda4f4 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 
Conflicts:
	indra/newview/llfloateravatarlist.cpp
	indra/newview/llfloatermessagelog.cpp
	indra/newview/llstartup.cpp
	indra/newview/llviewermenu.cpp
	indra/newview/llviewermessage.cpp
	indra/newview/skins/default/xui/fr/menu_inventory.xml
 2012-03-28 22:27:45 +02: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
21170e1e18 Fix build on Windows 2012-03-12 00:35:47 +01:00
Shyotl
a066730acb Added LLInitParam. Not yet plugged into xml parsing. 2012-02-24 20:16:33 -06:00
Siana Gearz
a632010b95 Boost: target Windows XP strictly 2012-02-23 15:35:50 +01:00
Siana Gearz
a1038f3972 Merge git://github.com/LightDrake/SingularityViewer 2012-02-23 03:06:19 +01:00
Drake Arconis
edbc22961e Revert "Further OS X changes." 
This reverts commit 803011582c.
 2012-02-22 05:49:38 -05:00
Drake Arconis
803011582c Further OS X changes. 2012-02-21 10:53:47 -05:00
Aleric Inglewood
2206f68129 Fix webkit on Ubuntu 
WARNING("Plugin"): LLPluginInstance::load: apr_dso_load of
*/viewer-linux-i686-releasesse2/newview/packaged/bin/llplugin/libmedia_plugin_webkit.so
failed with error 20019 , additional info string:
*/viewer-linux-i686-releasesse2/newview/packaged/bin/llplugin/libmedia_plugin_webkit.so:
undefined symbol: XSyncIntsToValue

Apparently our webkit package is underlinked, it doesn't
include libXext which is needed for symbol XSyncIntsToValue.
Both, Fritigern and Inusaito had this problem on Ubuntu.
This patch adds the library to the webkit plugin as a work-
around.
 2012-02-21 15:52:57 +01:00
Aleric Inglewood
39f8deb498 Merge remote-tracking branch 'siana/master' 2012-02-19 23:54:59 +01:00
Drake Arconis
665569dfc7 I forgot why I made these. 2012-02-19 17:07:42 -05:00
Drake Arconis
a4363de59e Updated APR and Zlib prebuilts. 2012-02-19 15:59:47 -05:00
Aleric Inglewood
66ccff964b Comment out old Google Translate support and as such remove the need for JSON. 
Note that on standalone, json headers are installed in json/,
no idea why in the packages this isn't the case... But anyway,
it isn't used at all anymore now so it doesn't really matter.

I didn't remove the json package for non-standalone and the
downloading thereof... (I can't test non-standalone).
 2012-02-18 16:45:11 +01:00
Siana Gearz
86cafba0df Linux fixes by Tofu 2012-02-17 15:57:21 +01:00
Siana Gearz
60081d7ed5 Melanie's fix of FMOD on OS X 2012-02-16 13:23:00 +01:00
TighMacFanatic
87cb88f2f7 Fixed CMake issue with Git version when building locally. 2012-02-11 23:04:16 -05:00
Siana Gearz
a3a7f72b7c Limit PCH size sanely 2012-02-09 15:22:07 +01:00
Siana Gearz
acf378e9f2 Auto-version system 2012-02-09 14:03:49 +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
fd22d80dfd Merge branch 'future' of https://github.com/Shyotl/SingularityViewer 
Conflicts:
	indra/newview/app_settings/shaders/class2/effects/gaussBlurF.glsl
	indra/newview/llmanipscale.cpp
	indra/newview/llmeshrepository.cpp
	indra/newview/llviewerregion.cpp
	indra/newview/llvovolume.cpp
 2011-12-24 20:12:12 +01:00
Siana Gearz
a57ac5a954 Make OpenJPEG respect our build settings 2011-12-23 23:23:55 +01:00
Siana Gearz
29045609a3 Attempt to fix linking on newer linux 2011-12-23 18:31:47 +01:00
Shyotl
c73414f1a1 A stab at fmodex support on windows. To use, install 'FMOD Ex Programmers API' to its defualt program files directory, and run develop.py with -DFMODEX:BOOL=ON set. That /should/ be all it takes. 2011-12-22 18:01:07 -06:00