xsd2ttcn: list length restriction corrected (Bug 495990)

[deliverable/titan.core.git] / Makefile.cfg

diff --git a/Makefile.cfg b/Makefile.cfg
index ea9473b0220788fc8eaeea5a710c7c7c9b6e40a4..53425f351f20bc5aa3d1167497914415778b9feb 100644 (file)
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -58,6 +58,11 @@ DEBUG := no
 # Set it to 'yes' to generate coverage data (requires DEBUG=yes)
 COVERAGE := no
 
+# Set it to 'yes' to enable extra features for the debugger UI in single mode
+# (this requires an extra library when linking the generated code).
+# Set it to 'no' to use a simplified debugger UI.
+ADVANCED_DEBUGGER_UI := yes
+
 # Your platform. Allowed values: SOLARIS, SOLARIS8, LINUX, FREEBSD,
 # WIN32. Decided automagically if not defined (recommended).
 # PLATFORM :=
@@ -88,11 +93,7 @@ JNI := yes
 
 # Path of the Java Developement Kit installation
 # (must be at least version  1.5.0_10)
-<<<<<<< HEAD
 JDKDIR := /usr/lib/jvm/default-java
-=======
-JDKDIR := /usr/lib/jvm/default-java 
->>>>>>> 4a0c4186d3c98f51d0735e21cca5918568a7082b
 
 # Path of OpenSSL installation: (always required)
 OPENSSL_DIR := default
@@ -219,6 +220,10 @@ ifeq ($(COVERAGE), yes)
   LDFLAGS += -fprofile-arcs -ftest-coverage -lgcov
 endif
 
+ifeq ($(ADVANCED_DEBUGGER_UI), yes)
+  CPPFLAGS += -DADVANCED_DEBUGGER_UI
+endif
+
 # Directory which contains the code for POSIX regular expression handling.
 # It is needed on platforms where the system's libc does not support POSIX
 # regexps. This is the case for Mingw.