Preparing for distribution of fullsoft headers, dlls, and exes

webshell/tests/viewer/makefile.win

@@ -78,7 +78,7 @@ LINCS=  \
   -I$(PUBLIC)\ngprefs \
 !endif
 !ifdef MOZ_FULLCIRCLE
-  -I$(PUBLIC)\fulls32 \
+  -I$(MOZ_TOOLS)\include \
 !endif
   -I$(PUBLIC)\oji \
   -I$(PUBLIC)\caps \
@@ -106,7 +106,7 @@ MYLIBS=                         \
  ole32.lib                      \
 !endif
 !ifdef MOZ_FULLCIRCLE
- $(DIST)\lib\fulls32.lib \
+ $(MOZ_TOOLS)\lib\fulls32.lib \
 !endif
  $(NULL)
 

xpfe/appshell/src/makefile.win

@@ -60,7 +60,7 @@ LINCS=-I$(PUBLIC)\raptor                \
       -I$(PUBLIC)\dom                   \
       -I$(PUBLIC)\js                    \
       -I$(PUBLIC)\pref                  \
- 	 -I$(PUBLIC)\profile               \
+      -I$(PUBLIC)\profile               \
       -I$(PUBLIC)\appcores              \
 !ifdef NECKO
       -I$(PUBLIC)\necko		\
@@ -68,9 +68,12 @@ LINCS=-I$(PUBLIC)\raptor                \
       -I$(PUBLIC)\netlib		\
 !endif
       -I$(PUBLIC)\rdf			\
-	  -I$(PUBLIC)\pics \
-	  -I$(PUBLIC)\xpfe\components \
-	  $(NULL)
+      -I$(PUBLIC)\pics \
+      -I$(PUBLIC)\xpfe\components \
+!ifdef MOZ_FULLCIRCLE
+      -I$(MOZ_TOOLS)\include \
+!endif
+     $(NULL)
 
 MAKE_OBJ_TYPE = DLL
 DLLNAME = nsappshell
@@ -95,6 +98,9 @@ LLIBS=                          \
  $(DIST)\lib\jsdombase_s.lib   \
  $(DIST)\lib\jsdomevents_s.lib   \
  $(LIBNSPR)                     \
+!ifdef MOZ_FULLCIRCLE
+ $(MOZ_TOOLS)\lib\fulls32.lib \
+!endif
  $(NULL)
 
 include <$(DEPTH)\config\rules.mak>

xpfe/bootstrap/makefile.win

@@ -58,7 +58,11 @@ LINCS=-I$(PUBLIC)\raptor                \
       -I$(PUBLIC)\appcores				\
       -I$(PUBLIC)\walletlib             \
       -I$(PUBLIC)\xpfe\components       \
-      -I$(PUBLIC)\oji    
+      -I$(PUBLIC)\oji                   \
+!ifdef MOZ_FULLCIRCLE
+      -I$(MOZ_TOOLS)\include            \
+!endif
+      $(NULL)
 #      -I..\browser
 
 MAKE_OBJ_TYPE = EXE
@@ -78,6 +82,9 @@ LLIBS=                          \
  $(DIST)\lib\neckoutil_s.lib    \
 !else
  $(DIST)\lib\netlib.lib         \
+!endif
+!ifdef MOZ_FULLCIRCLE
+ $(MOZ_TOOLS)\lib\fulls32.lib \
 !endif
  $(LIBNSPR)                     \
  $(NULL)