summaryrefslogtreecommitdiffstats
path: root/o3d/plugin/plugin.gyp
Commit message (Collapse)AuthorAgeFilesLines
* o3d plugin was mistakenly being built as a static library when built outside ↵bradnelson@google.com2009-08-271-10/+1
| | | | | | | | | | | | | | of chrome. This was preventing the installer from baking it in. BUG=None TEST=None TBR=gspencer Review URL: http://codereview.chromium.org/173591 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24666 0039d316-1c4b-4281-b951-d872f2087c98
* Fix the build by fixing a typo in plugin.gypgspencer@google.com2009-08-261-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24481 0039d316-1c4b-4281-b951-d872f2087c98
* Changes needed to get everything packaged for Mac.maf@google.com2009-08-261-1/+24
| | | | | | Review URL: http://codereview.chromium.org/173453 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24478 0039d316-1c4b-4281-b951-d872f2087c98
* Add missing frameworks to plugin project. maf@google.com2009-08-251-1/+37
| | | | | | | | Adjust a lot of build voodoo to get things set correctly for a mach-o bundled plugin. Create scripts to install private frameworks and modify the plugin to use the private copies. Review URL: http://codereview.chromium.org/173329 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24291 0039d316-1c4b-4281-b951-d872f2087c98
* Changes needed to get Mac plugin gyp project build compiling and linking.maf@google.com2009-08-131-0/+14
| | | | | | Review URL: http://codereview.chromium.org/165433 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23375 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed some warnings in bitmap_png.ccbradnelson@google.com2009-08-101-1/+1
| | | | | | | | | | | | | | Switched to using the latest nacl and using their gyp files. Added a copy/rename step so that o3dConverter gets the dll it needs for other build steps. BUG=None TEST=None TBR=gspencer Review URL: http://codereview.chromium.org/164238 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22891 0039d316-1c4b-4281-b951-d872f2087c98
* This completes the building of o3d.msi from the GYP build.gspencer@google.com2009-08-061-2/+2
| | | | | | Review URL: http://codereview.chromium.org/164044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22680 0039d316-1c4b-4281-b951-d872f2087c98
* Need to define XP_MACOSX=1 for npapi.h to work as needed on Mac.maf@google.com2009-08-061-0/+3
| | | | | | | This fixes all the "does not define a type" compile errors. Review URL: http://codereview.chromium.org/164046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22639 0039d316-1c4b-4281-b951-d872f2087c98
* Add SetRect to Texture2d and TextureCUBEgman@google.com2009-08-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally I was going to replace Lock/Unlock with only SetRect (and maybe GetRect) and I did that. But then as I was going through the code things started not being so cool. The JavaScript texture.SetRect where as before it allocated no memory, now it needed to allocate a temporary buffer just to be able to write the texture. DrawImage also would have have required copying the original texture out using GetRect, then modifying it, then copying it back even in D3D or it would have required a temporary buffer. That's what happens under the hood in the GL implementation of Texture2D but why should D3D suffer because of the of GL? Or maybe it's a reasonable compomise the D3D should go slower so that GL isn't twice as slow as it it could be? So, I left Lock/Unlock and added SetRect as well. This CL should help the video guys and we can decide if we want to get rid of Lock/Unlock later. SetRect is really only there because trying to make GL act like D3D makes GL slow since we had to get a copy of the texture from GL before Locking. SetRect, since it is not exposing the original data doesn't need to do that. So, now there are both. If need to read (and write) to the texture use Lock. If you only need to write use SetRect. I also fixed Lock/Unlock so they return a pitch which is required for D3D. While I did that I made Lock/Unlock private so you have to use the TextureXXXLockHelpers to access the data. I didn't do the command buffer versions. I also added stubs for texture tests. We need to add more tests. I feel like a lot of clean up needs to happen. It seesm like Bitmap should be split into Bitmap2D BitmapCUBE BitmapVolume Possibly. And maybe BitmapCube should effectively just be typedef Bitmap2D BitmapCUBE[6] and BitmapVolume would be std::vector<Bitmap2D> Then we wouldn't need face and volume versions of various functions. You'd just get the face or the slice Bitma2D and then use the 2D functions. We should decide if that's what we want before pushing a new release. Otherwise we should remove bitmap.idl from idl_scons.lst and the one sample And ship without exposing Bitmap until we are sure they API we are exposing is the one we want. Review URL: http://codereview.chromium.org/159725 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22332 0039d316-1c4b-4281-b951-d872f2087c98
* Asynchronous tick now uses NPN_PluginAsyncCall.URL streaming callbacks are ↵apatrick@google.com2009-08-031-0/+2
| | | | | | | | now also asynchronous.Implemented NPN_PluginAsyncCall for IE.Allowed WM_PAINT handler to be reentered because it no longer calls into the browser (except to schedule an asynchronous tick if none is pending).Fixed a bug where the EventManager would crash if an event callback called cleanUp on the client.Cleanup destroys all the packs. Doing this in NPP_Destroy seems to make Chrome timeout and fail to load the next page.Tar and GZ decoding happens on a new thread. Review URL: http://codereview.chromium.org/155733 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22305 0039d316-1c4b-4281-b951-d872f2087c98
* This adds the sample conversion to the GYP build, at least on Windows.gspencer@google.com2009-07-301-2/+2
| | | | | | | | | It also fixes some small problems with the build (naming of plugin DLL and activex host dll) Review URL: http://codereview.chromium.org/160428 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22122 0039d316-1c4b-4281-b951-d872f2087c98
* Adds in the ActiveX control for O3D.gspencer@google.com2009-07-241-2/+63
| | | | | | Review URL: http://codereview.chromium.org/160078 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21492 0039d316-1c4b-4281-b951-d872f2087c98
* These are gyp file changes that start to make the Mac GYP build work.gspencer@google.com2009-07-221-5/+6
| | | | | | | | It still doesn't but I want to checkpoint these changes. Review URL: http://codereview.chromium.org/155890 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21279 0039d316-1c4b-4281-b951-d872f2087c98
* This adds some infrastructure for building O3D as part of the Chrome build,gspencer@google.com2009-07-151-16/+28
| | | | | | | | | | | and fixes some of the "AdditionalDependencies" tags to be just generic 'libraries' tags to be more general. TEST=none BUG=none Review URL: http://codereview.chromium.org/149650 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20688 0039d316-1c4b-4281-b951-d872f2087c98
* This splits the import.gyp file into two parts (one for building archive lib,gspencer@google.com2009-07-141-4/+1
| | | | | | | | | | and one for building import lib), so that the chrome build can depend only on the archive.gyp file to reduce its dependencies. It also adds a missing gyp file for the tests. Review URL: http://codereview.chromium.org/149623 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20638 0039d316-1c4b-4281-b951-d872f2087c98
* Adding in most of the unit tests. This adds 406 of our unit testsgspencer@google.com2009-07-011-6/+12
| | | | | | | | | into the gyp build. 21 of them fail, but that is only because they don't have test input yet -- I haven't added the build code that copies the test inputs into the build dir yet. Review URL: http://codereview.chromium.org/147129 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19778 0039d316-1c4b-4281-b951-d872f2087c98
* This adds in the GYP files needed for our GYP build,gspencer@google.com2009-06-241-0/+200
and modifies the DEPS file extensively to match. Review URL: http://codereview.chromium.org/131116 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19091 0039d316-1c4b-4281-b951-d872f2087c98