Fix build compat with Gecko 1.8 (npotb)

This commit is contained in:
vladimir%pobox.com 2006-09-10 22:38:21 +00:00
Родитель 41616dcbdc
Коммит edd0f8b4bd
3 изменённых файлов: 23 добавлений и 5 удалений

Просмотреть файл

@ -16,15 +16,25 @@
extension was built for, because of the way we're tied extension was built for, because of the way we're tied
to internal interfaces. to internal interfaces.
--> -->
#ifdef MOZILLA_1_8_BRANCH
<em:minVersion>2.0b1</em:minVersion>
<em:maxVersion>2.0.*</em:maxVersion>
#else
<em:minVersion>3.0a1</em:minVersion> <em:minVersion>3.0a1</em:minVersion>
<em:maxVersion>3.0a1</em:maxVersion> <em:maxVersion>3.0a1</em:maxVersion>
#endif
</Description> </Description>
</em:targetApplication> </em:targetApplication>
<!-- front-end metadata --> <!-- front-end metadata -->
<em:creator>Vladimir Vukicevic/mozilla.com</em:creator> <em:creator>Vladimir Vukicevic/mozilla.com</em:creator>
<em:name>Canvas 3D</em:name> #ifdef MOZILLA_1_8_BRANCH
<em:description>Canvas 3D context(s)</em:description> <em:name>Canvas 3D (Gecko 1.8.1)</em:name>
<em:description>Canvas 3D context(s) for Gecko 1.8.1</em:description>
#else
<em:name>Canvas 3D (Gecko 1.9)</em:name>
<em:description>Canvas 3D context(s) for Gecko 1.9</em:description>
#endif
<em:homepageURL>http://people.mozilla.com/~vladimir/canvas3d/</em:homepageURL> <em:homepageURL>http://people.mozilla.com/~vladimir/canvas3d/</em:homepageURL>
</Description> </Description>
</RDF> </RDF>

Просмотреть файл

@ -79,9 +79,12 @@ REQUIRES = \
uconv \ uconv \
intl \ intl \
cairo \ cairo \
thebes \
$(NULL) $(NULL)
ifdef MOZ_ENABLE_CAIRO_GFX
REQUIRES += thebes
endif
GLITZ_SRC_DIR = $(topsrcdir)/gfx/cairo/glitz/src GLITZ_SRC_DIR = $(topsrcdir)/gfx/cairo/glitz/src
VPATH += $(GLITZ_SRC_DIR) VPATH += $(GLITZ_SRC_DIR)
@ -151,7 +154,11 @@ CPPSRCS = nsCanvas3DModule.cpp \
DEFINES += -DXPCOM_GLUE -DGLEW_MX -DGLEW_STATIC DEFINES += -DXPCOM_GLUE -DGLEW_MX -DGLEW_STATIC
EXTRA_DSO_LIBS += thebes js3250 mozcairo mozlibpixman xpcom nspr4 xpcom_core EXTRA_DSO_LIBS += js3250 mozcairo mozlibpixman xpcom nspr4 xpcom_core
ifdef MOZ_ENABLE_CAIRO_GFX
EXTRA_DSO_LIBS += thebes
endif
# Hack for getting an extension built against static vs. dynamic versions of firefox # Hack for getting an extension built against static vs. dynamic versions of firefox
ifeq (,$(BUILD_STATIC_LIBS)) ifeq (,$(BUILD_STATIC_LIBS))

Просмотреть файл

@ -49,9 +49,10 @@
#ifndef MOZILLA_1_8_BRANCH #ifndef MOZILLA_1_8_BRANCH
#include "nsIDocument.h" #include "nsIDocument.h"
#include "nsTransform2D.h"
#endif #endif
#include "nsTransform2D.h"
#include "nsIScriptSecurityManager.h" #include "nsIScriptSecurityManager.h"
#include "nsISecurityCheckedComponent.h" #include "nsISecurityCheckedComponent.h"