[Libreoffice-commits] .: 2 commits - odk/examples

[Tor Lillqvist]

 odk/examples/CLI/CSharp/Spreadsheet/Makefile |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 5147b840b68a4c048d0c2dc356a7b4138f694bd7
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jun 10 17:21:16 2011 +0300

    Build specifically for x86 only as that is what cli_cppuhelper.dll is

diff --git a/odk/examples/CLI/CSharp/Spreadsheet/Makefile b/odk/examples/CLI/CSharp/Spreadsheet/Makefile
index 15dc049..a8dba1c 100644
--- a/odk/examples/CLI/CSharp/Spreadsheet/Makefile
+++ b/odk/examples/CLI/CSharp/Spreadsheet/Makefile
@@ -12,7 +12,7 @@ include $(SETTINGS)/settings.mk
 include $(SETTINGS)/std.mk
 #include $(SETTINGS)/dk.mk
 
-CSC_FLAGS = -warnaserror+ -noconfig
+CSC_FLAGS = -warnaserror+ -noconfig -platform:x86
 VBC_FLAGS = -warnaserror+
 ifeq "$(DEBUG)" "yes"
 CC_FLAGS+=-Zi -MT
commit 0a4ce2c48098f5c42587bd0aae279339252fa509
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jun 10 17:17:05 2011 +0300

    Fix typo, add some comments, use build env if possible to find cli_*.dll

diff --git a/odk/examples/CLI/CSharp/Spreadsheet/Makefile b/odk/examples/CLI/CSharp/Spreadsheet/Makefile
index 14785e8..15dc049 100644
--- a/odk/examples/CLI/CSharp/Spreadsheet/Makefile
+++ b/odk/examples/CLI/CSharp/Spreadsheet/Makefile
@@ -1,5 +1,10 @@
 # Builds the SpreadSheet examples of the Developers Guide.
 
+# This Makefile is supposed to be run by a GNU Make built for native
+# Windows Not the Cygwin GNU Make, not dmake, not Microsoft's NMAKE.
+# But yeah, that is what the setsdkenv_windows.bat file in
+# ../../../.. presumably tries to set up.
+
 PRJ = ../../../..
 SETTINGS = $(PRJ)/settings
 
@@ -21,7 +26,14 @@ endif
 THIS_OUT_MISC = $(OUT_MISC)/csharp_SpreadsheetExamples
 
 SPREADSHEET_OUT:= $(OUT_BIN)/CSharp_SpreadsheetExamples
+
+ifneq "$(OUTDIR)" ""
+# We are running in a LO build environment, good
+CLI_LIB_LOCATION = $(OUTDIR)\bin
+else
+# Bad guess, but hey, this is how it was
 CLI_LIB_LOCATION = $(PRJ)\cli
+endif
 
 # Targets
 .PHONY : ALL
@@ -54,7 +66,7 @@ ViewSample : $(SPREADSHEET_OUT)/ViewSample.exe
 
 .PHONY : Info
 ifeq "$(OS)" "WIN"
-Info : SpreadsheetSample GenerateTableSample ViewSample
+Info : SpreadsheetSample GeneralTableSample ViewSample
 	@echo -------------------------------------------------------------------------------
 	@echo Please use one of the following commands to execute the examples!
 	@echo -