GNOME.org
 

ooo-build r13843 - trunk/patches/test

Author: jholesovsky
Date: Mon Sep  8 15:20:09 2008
New Revision: 13843
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13843&view=rev

Log:
Update, small sdi build fix.


Modified:
   trunk/patches/test/win32-crosscompilation.diff

Modified: trunk/patches/test/win32-crosscompilation.diff
==============================================================================
--- trunk/patches/test/win32-crosscompilation.diff	(original)
+++ trunk/patches/test/win32-crosscompilation.diff	Mon Sep  8 15:20:09 2008
@@ -29,10 +29,10 @@
      -ft=$@ \
  	$(RSC1HEADER) $(RESLIB1SRSFILES) \
 diff --git a/solenv/inc/_tg_sdi.mk b/solenv/inc/_tg_sdi.mk
-index 238dc76..ab1911f 100755
+index 238dc76..77374b4 100755
 --- a/solenv/inc/_tg_sdi.mk
 +++ b/solenv/inc/_tg_sdi.mk
-@@ -14,6 +14,8 @@ $(HIDSID1PARTICLE): $(SDI1TARGET)
+@@ -14,19 +14,21 @@ $(HIDSID1PARTICLE): $(SDI1TARGET)
  	@$(RENAME) $  $(ROUT).tmp $@
  .ENDIF # "$(HIDSID1PARTICLE)"!=""
  
@@ -41,12 +41,18 @@
  .IF "$(SDI1TARGET)"!=""
  $(SDI1TARGET): $(SVSDI1DEPEND) $(SDI1NAME).sdi
  	@echo ------------------------------
-@@ -26,7 +28,7 @@ $(SDI1TARGET): $(SVSDI1DEPEND) $(SDI1NAME).sdi
+ 	@echo Making: $@
+ 	@-$(RM) $@
+-	$(SVIDL) @$(mktmp \
++	$(SVIDL) \
+ 	-fs$(INCCOMX)$/$(SDI1NAME).hxx	\
+ 	-fd$(INCCOMX)$/$(SDI1NAME).ilb	\
+ 	-fm$(MISC)$/$(SDI1NAME).don	\
  	-fl$(MISC)$/$(SDI1NAME).lst         \
  	-fx$(SDI1EXPORT).sdi		\
  	-fz$(MISC)$/$(SDI1NAME).sid	\
 -	$(SDI1NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
-+	$(SDI1NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(subst,-Iz$(COLON_HACK),-I $(INCLUDE)))
++	$(SDI1NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(subst,-Iz$(COLON_HACK),-I $(INCLUDE))
  .ENDIF # "$(SDI1TARGET)"!=""
  
  # Instruction for ???
@@ -233,10 +239,6 @@
  .ENDIF # "$(make_srs_deps)"!=""
  
  #new
-diff --git a/solenv/inc/startup/WNT/.macros.mk.swp b/solenv/inc/startup/WNT/.macros.mk.swp
-new file mode 100644
-index 0000000..38ce47f
-Binary files /dev/null and b/solenv/inc/startup/WNT/.macros.mk.swp differ
 diff --git a/solenv/inc/startup/WNT/CVS/Entries b/solenv/inc/startup/WNT/CVS/Entries
 new file mode 100755
 index 0000000..207dd3d
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]