diff options
Diffstat (limited to 'indra/llplugin/slplugin')
| -rw-r--r-- | indra/llplugin/slplugin/CMakeLists.txt | 19 | ||||
| -rw-r--r-- | indra/llplugin/slplugin/slplugin-objc.h | 35 | ||||
| -rw-r--r-- | indra/llplugin/slplugin/slplugin-objc.mm | 82 | ||||
| -rw-r--r-- | indra/llplugin/slplugin/slplugin.cpp | 58 |
4 files changed, 24 insertions, 170 deletions
diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt index 08d35f9ae7..c1536e85de 100644 --- a/indra/llplugin/slplugin/CMakeLists.txt +++ b/indra/llplugin/slplugin/CMakeLists.txt @@ -16,7 +16,6 @@ include_directories( if (DARWIN) include(CMakeFindFrameworks) find_library(CARBON_LIBRARY Carbon) - find_library(COCOA_LIBRARY Cocoa) endif (DARWIN) @@ -26,22 +25,6 @@ set(SLPlugin_SOURCE_FILES slplugin.cpp ) -if (DARWIN) - list(APPEND SLPlugin_SOURCE_FILES - slplugin-objc.mm - ) - list(APPEND SLPlugin_HEADER_FILES - slplugin-objc.h - ) -endif (DARWIN) - -set_source_files_properties(${SLPlugin_HEADER_FILES} - PROPERTIES HEADER_FILE_ONLY TRUE) - -if (SLPlugin_HEADER_FILES) - list(APPEND SLPlugin_SOURCE_FILES ${SLPlugin_HEADER_FILES}) -endif (SLPlugin_HEADER_FILES) - add_executable(SLPlugin WIN32 MACOSX_BUNDLE @@ -68,7 +51,7 @@ add_dependencies(SLPlugin if (DARWIN) # Mac version needs to link against Carbon - target_link_libraries(SLPlugin ${CARBON_LIBRARY} ${COCOA_LIBRARY}) + target_link_libraries(SLPlugin ${CARBON_LIBRARY}) # Make sure the app bundle has a Resources directory (it will get populated by viewer-manifest.py later) add_custom_command( TARGET SLPlugin POST_BUILD diff --git a/indra/llplugin/slplugin/slplugin-objc.h b/indra/llplugin/slplugin/slplugin-objc.h deleted file mode 100644 index 602d848f7e..0000000000 --- a/indra/llplugin/slplugin/slplugin-objc.h +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file slplugin-objc.h - * @brief Header file for slplugin-objc.mm. - * - * @cond - * - * $LicenseInfo:firstyear=2010&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - * - * @endcond - */ - - -/* Defined in slplugin-objc.mm: */ -void setupCocoa(); -void createAutoReleasePool(); -void deleteAutoReleasePool(); diff --git a/indra/llplugin/slplugin/slplugin-objc.mm b/indra/llplugin/slplugin/slplugin-objc.mm deleted file mode 100644 index 646416b9d2..0000000000 --- a/indra/llplugin/slplugin/slplugin-objc.mm +++ /dev/null @@ -1,82 +0,0 @@ -/** - * @file slplugin-objc.mm - * @brief Objective-C++ file for use with the loader shell, so we can use a couple of Cocoa APIs. - * - * @cond - * - * $LicenseInfo:firstyear=2010&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - * - * @endcond - */ - - -#include <AppKit/AppKit.h> - -#include "slplugin-objc.h" - - -void setupCocoa() -{ - static bool inited = false; - - if(!inited) - { - createAutoReleasePool(); - - // The following prevents the Cocoa command line parser from trying to open 'unknown' arguements as documents. - // ie. running './secondlife -set Language fr' would cause a pop-up saying can't open document 'fr' - // when init'ing the Cocoa App window. - [[NSUserDefaults standardUserDefaults] setObject:@"NO" forKey:@"NSTreatUnknownArgumentsAsOpen"]; - - // This is a bit of voodoo taken from the Apple sample code "CarbonCocoa_PictureCursor": - // http://developer.apple.com/samplecode/CarbonCocoa_PictureCursor/index.html - - // Needed for Carbon based applications which call into Cocoa - NSApplicationLoad(); - - // Must first call [[[NSWindow alloc] init] release] to get the NSWindow machinery set up so that NSCursor can use a window to cache the cursor image - [[[NSWindow alloc] init] release]; - - deleteAutoReleasePool(); - - inited = true; - } -} - -static NSAutoreleasePool *sPool = NULL; - -void createAutoReleasePool() -{ - if(!sPool) - { - sPool = [[NSAutoreleasePool alloc] init]; - } -} - -void deleteAutoReleasePool() -{ - if(sPool) - { - [sPool release]; - sPool = NULL; - } -} diff --git a/indra/llplugin/slplugin/slplugin.cpp b/indra/llplugin/slplugin/slplugin.cpp index 7d69e1c5cd..7d6dde1a58 100644 --- a/indra/llplugin/slplugin/slplugin.cpp +++ b/indra/llplugin/slplugin/slplugin.cpp @@ -4,25 +4,30 @@ * * @cond * - * $LicenseInfo:firstyear=2008&license=viewerlgpl$ + * $LicenseInfo:firstyear=2008&license=viewergpl$ + * + * Copyright (c) 2008, Linden Research, Inc. + * * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * The source code in this file ("Source Code") is provided by Linden Lab + * to you under the terms of the GNU General Public License, version 2.0 + * ("GPL"), unless you have obtained a separate licensing agreement + * ("Other License"), formally executed by you and Linden Lab. Terms of + * the GPL can be found in doc/GPL-license.txt in this distribution, or + * online at http://secondlife.com/developers/opensource/gplv2 + * + * There are special exceptions to the terms and conditions of the GPL as + * it is applied to this Source Code. View the full text of the exception + * in the file doc/FLOSS-exception.txt in this software distribution, or + * online at http://secondlife.com/developers/opensource/flossexception + * + * By copying, modifying or distributing this software, you acknowledge + * that you have read and understood your obligations described above, + * and agree to abide by those obligations. + * + * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO + * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, + * COMPLETENESS OR PERFORMANCE. * $/LicenseInfo$ * * @endcond @@ -39,7 +44,6 @@ #if LL_DARWIN #include <Carbon/Carbon.h> - #include "slplugin-objc.h" #endif #if LL_DARWIN || LL_LINUX @@ -225,19 +229,10 @@ int main(int argc, char **argv) signal(SIGSYS, &crash_handler); // non-existent system call invoked #endif -#if LL_DARWIN - setupCocoa(); - createAutoReleasePool(); -#endif - LLPluginProcessChild *plugin = new LLPluginProcessChild(); plugin->init(port); -#if LL_DARWIN - deleteAutoReleasePool(); -#endif - LLTimer timer; timer.start(); @@ -265,9 +260,6 @@ int main(int argc, char **argv) #endif while(!plugin->isDone()) { -#if LL_DARWIN - createAutoReleasePool(); -#endif timer.reset(); plugin->idle(); #if LL_DARWIN @@ -385,10 +377,6 @@ int main(int argc, char **argv) // exception handler such as QuickTime. //checkExceptionHandler(); #endif - -#if LL_DARWIN - deleteAutoReleasePool(); -#endif } delete plugin; |