summaryrefslogtreecommitdiff
path: root/odk
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-06-10 17:17:05 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-06-10 17:17:05 +0300
commit9d090acb4ed8f68a6c60b741f5befeeacf9a84b7 (patch)
treec6eb86274915d2245e6ca906f4309688a43d78f1 /odk
parent93e7bea1487176b9584f4c44ec19568ef8dd96c0 (diff)
Fix typo, add some comments, use build env if possible to find cli_*.dll
Diffstat (limited to 'odk')
-rw-r--r--odk/examples/CLI/CSharp/Spreadsheet/Makefile14
1 files changed, 13 insertions, 1 deletions
diff --git a/odk/examples/CLI/CSharp/Spreadsheet/Makefile b/odk/examples/CLI/CSharp/Spreadsheet/Makefile
index 14785e8efec3..15dc04967b20 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 -