Changeset 1648:18bbb1436153

Timestamp:

03/10/10 22:21:05 (2 years ago)

Author:

Kelly Wilson <wilsonk cpsc.ucalgary.ca>

Tags:

0.9.2

branch:

default

Message:

Change the ldc.conf file output to match the newer Tango directory structure and only use libtango-user-ldc for the libs to match the 0.99.9 build instructions.

Files:

• CMakeLists.txt (modified) (1 diff)
• ldc.conf.in (modified) (1 diff)
• runtime/CMakeLists.txt (modified) (1 diff)

CMakeLists.txt

@@ -23 +23 @@
-    endif(NOT LIBCONFIGPP_FOUND)
-endif(NOT PKG_CONFIG_FOUND)
-
-
-find_program(LLVM_CONFIG llvm-config ${LLVM_INSTDIR}/bin DOC "path to llvm-config tool")

ldc.conf.in

@@ -13 +13 @@
-    switches = [
-        "-I@RUNTIME_DIR@",
+        "-I@RUNTIME_DIR@/user",
-        "-I@RUNTIME_DIR@/lib/common",
+        "-I@RUNTIME_DIR@/tango/core/vendor",
-        "-L-L%%ldcbinarypath%%/../lib",
-        "-d-version=Tango",

runtime/CMakeLists.txt

@@ -47 +47 @@
-    set(RUNTIME_GC tango-gc-basic)
-    set(RUNTIME_DC ldc-runtime)
-base
+user
-    # set paths to source files, or fill lists directly
-    set(RUNTIME_DC_DIR ${PROJECT_SOURCE_DIR}/internal)