livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed some final dependencies to Awesomium and Flash ActiveX (mostly porting over Callum's change: r132166) 

DEV-39138 build process on parabuild fails due to missing flash activex plugin
meow-7.2.2
Sam Kolb 2009-08-31 23:08:06 +00:00
parent 5e7034a53b
commit 410e2228fd
3 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/CMakeLists.txt
View File

@ -1583,10 +1583,3 @@ if (WINDOWS)
)
endif (WINDOWS)
if (DARWIN)
# Don't do this here -- it's taken care of by viewer_manifest.py
# add_custom_command(TARGET ${VIEWER_BINARY_NAME} POST_BUILD
# COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin/
# DEPENDS ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib
# )
endif (DARWIN)

21
indra/test_apps/llplugintest/llmediaplugintest.cpp
View File

@ -1,5 +1,5 @@
/**
* @file LLMediaPluginTest2.cpp
* @file LLMediaPluginTest.cpp
* @brief Primary test application for LLMedia (Separate Process) Plugin system
*
* $LicenseInfo:firstyear=2008&license=viewergpl$
@ -222,14 +222,13 @@ LLMediaPluginTest::LLMediaPluginTest( int app_window, int window_width, int wind
resetView();
// initial media panel
//const int num_initial_panels = 4;
//for( int i = 0; i < num_initial_panels; ++i )
//{
// addMediaPanel( mBookmarks[ rand() % ( mBookmarks.size() - 1 ) + 1 ].second );
//};
// always add a Web panel for testing
addMediaPanel( "http://www.google.com" );
const int num_initial_panels = 1;
for( int i = 0; i < num_initial_panels; ++i )
{
//addMediaPanel( mBookmarks[ rand() % ( mBookmarks.size() - 1 ) + 1 ].second );
addMediaPanel( mHomeWebUrl );
};
}
////////////////////////////////////////////////////////////////////////////////
@ -2113,13 +2112,13 @@ int main( int argc, char* argv[] )
const int app_window_x = 80;
const int app_window_y = 0;
const int app_window_width = 964;
const int app_window_height = 964;
const int app_window_width = 960;
const int app_window_height = 960;
glutInitWindowPosition( app_window_x, app_window_y );
glutInitWindowSize( app_window_width, app_window_height );
int app_window_handle = glutCreateWindow( "LLMediaPluginTest2" );
int app_window_handle = glutCreateWindow( "LLMediaPluginTest" );
glutDisplayFunc( glutDisplay );

2
indra/test_apps/llplugintest/llmediaplugintest.h
View File

@ -1,5 +1,5 @@
/**
* @file LLMediaPluginTest2.cpp
* @file LLMediaPluginTest.cpp
* @brief Primary test application for LLMedia (Separate Process) Plugin system
*
* $LicenseInfo:firstyear=2008&license=viewergpl$