Commit ed764e9e authored by kin%netscape.com's avatar kin%netscape.com
Browse files

Makefile.in and config modifications to allow us to build the new NGT based

editor.
parent f6198022
Loading
Loading
Loading
Loading
+7 −2
Original line number Diff line number Diff line
@@ -68,8 +68,13 @@ DIRS += \
  view				\
  widget			\
  layout			\
  webshell			\
  xpfe
  webshell

ifdef MOZ_EDITOR
DIRS += editor
endif

DIRS += xpfe

include $(topsrcdir)/config/config.mk

+1 −11
Original line number Diff line number Diff line
@@ -513,10 +513,7 @@ DEFINES += -DSMOOTH_PROGRESS
endif

ifdef MOZ_EDITOR
#
# Enable HTMLArea form element support.
#
DEFINES		+= -DENDER -DMOZ_ENDER_MIME
DEFINES		+= -DNGEDITOR
endif

ifdef MOZ_SECURITY
@@ -528,13 +525,6 @@ ifdef MOZ_FULLCIRCLE
DEFINES		+= -DMOZ_FULLCIRCLE
endif

ifdef MOZ_EDITOR
DEFINES		+= -DEDITOR -DEDITOR_UI
BUILD_EDITOR	= 1
BUILD_EDITOR_UI	= 1
BUILD_EDT	= 1
endif

# Build layers by default
ifndef NO_LAYERS
DEFINES		+= -DLAYERS
+3 −0
Original line number Diff line number Diff line
@@ -898,6 +898,9 @@ dom/src/events/Makefile
dom/src/html/Makefile
dom/src/jsurl/Makefile
dom/tools/Makefile
editor/Makefile
editor/core/Makefile
editor/public/Makefile
gfx/Makefile
gfx/public/Makefile
gfx/src/Makefile
+4 −0
Original line number Diff line number Diff line
@@ -132,6 +132,10 @@ EX_LIBS = \
	-lraptorplugin \
	$(NULL)

ifdef MOZ_EDITOR
EX_LIBS += -lender
endif

ifneq (,$(filter FreeBSD Linux SunOS,$(OS_ARCH)))
EX_LIBS += \
	-lpwcac \