# HG changeset patch # User Frits van Bommel # Date 1235047805 -3600 # Node ID 4c0df37d04212167fb949973c2833e885ffc062b # Parent 6e68054cfc20137291c1dbef610e22f5dad0ab56 Removing ldc.conf. (IMPORTANT: run 'cmake .' after pull) Added it to .hgignore. This gets rid of spurious differences caused by CMake regenerating it differently. Just run 'cmake .' to get it back in your local checkout. diff -r 6e68054cfc20 -r 4c0df37d0421 .hgignore --- a/.hgignore Thu Feb 19 11:01:34 2009 +0100 +++ b/.hgignore Thu Feb 19 13:50:05 2009 +0100 @@ -23,6 +23,7 @@ ^druntime ^import ^bin/ldc +^bin/ldc2?\.conf ^idgen.make ^impcnvgen.make ^ldc.make diff -r 6e68054cfc20 -r 4c0df37d0421 bin/ldc.conf --- a/bin/ldc.conf Thu Feb 19 11:01:34 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ - -[Environment] - -DFLAGS=-I%@P%/../tango -I%@P%/../tango/lib/common -L-L%@P%/../lib -version=Tango diff -r 6e68054cfc20 -r 4c0df37d0421 bin/ldc2.conf --- a/bin/ldc2.conf Thu Feb 19 11:01:34 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -[Environment] -DFLAGS=-I%@P%/../druntime/import -L-L%@P%/../druntime/lib diff -r 6e68054cfc20 -r 4c0df37d0421 runtime/CMakeLists.txt --- a/runtime/CMakeLists.txt Thu Feb 19 11:01:34 2009 +0100 +++ b/runtime/CMakeLists.txt Thu Feb 19 13:50:05 2009 +0100 @@ -114,7 +114,9 @@ ${OUTPUT_O} ${OUTPUT_BC} COMMAND ${LDC_LOC} -c -I${INCDIR} -output-bc ${INPUT_D} -of${OUTPUT_O} ${D_FLAGS} ${MOREFLAGS} - DEPENDS ${LDC_LOC} ${LDC_IMPORTS} + DEPENDS ${LDC_LOC} + ${LDC_IMPORTS} + ${PROJECT_BINARY_DIR}/../bin/${LDC_EXE}.conf ) endmacro(dc) @@ -168,6 +170,7 @@ ${CORE_BC} ${GC_BC} ${DCRT_BC} + ${LDC_IMPORTS} ) set(BCLIBS bclibs) endif(BUILD_BC_LIBS)