From 753bde2bc39d1f3608990e7d3238be2bc1eee55b Mon Sep 17 00:00:00 2001 From: "locka%iol.ie" Date: Tue, 13 Jan 2004 21:12:51 +0000 Subject: [PATCH] NOT PART OF BUILD. Fix makefile so wxEmbed builds once more git-svn-id: svn://10.0.0.236/trunk@151261 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/embedding/tests/wxEmbed/makefile.vc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mozilla/embedding/tests/wxEmbed/makefile.vc b/mozilla/embedding/tests/wxEmbed/makefile.vc index 35e4ed3d5f5..d9932658981 100644 --- a/mozilla/embedding/tests/wxEmbed/makefile.vc +++ b/mozilla/embedding/tests/wxEmbed/makefile.vc @@ -1,5 +1,3 @@ -MOZ_SRC = c:\m\source_1.4 - WXDIR = $(WXWIN) MOZDIR = $(MOZ_SRC)\mozilla MOZSDK = $(MOZDIR)\dist @@ -43,6 +41,7 @@ MOZINC = \ -I$(MOZSDK)\include\profile \ -I$(MOZSDK)\include\webbrwsr \ -I$(MOZSDK)\include\embed_base \ + -I$(MOZSDK)\include\embedstring \ -I$(MOZSDK)\include\windowwatcher \ -I$(MOZSDK)\include\composer \ -I$(MOZSDK)\include\commandhandler \ @@ -55,8 +54,10 @@ MOZLIBS = \ $(NULL) # $(MOZSDK)\lib\xpcomglue_s.lib \ -MOZDEFS = \ - -DXPCOM_GLUE \ +# -DXPCOM_GLUE \ +EXTRAFLAGS = \ + -DXP_WIN \ + -DXP_WIN32 \ $(NULL) EXTRALIBS = $(WXDIR)\lib\wxxrc$(LIBEXT).lib $(MOZLIBS) @@ -64,8 +65,6 @@ EXTRAINC = -I$(WXDIR)\contrib\include $(MOZINC) !include $(WXDIR)\src\makeprog.vc -# CPPFLAGS = $(CPPFLAGS) $(MOZDEFS) - all: -copy $(PROGRAM).exe $(MOZDIR)\dist\bin