From 212a53f5a4baa1c9f9d76b70d4da5000d49fdfc8 Mon Sep 17 00:00:00 2001 From: kintel Date: Wed, 9 Dec 2009 02:45:36 +0000 Subject: Be consistent when using defines; #if vs. #ifdef git-svn-id: http://svn.clifford.at/openscad/trunk@150 b57f626f-c46c-0410-a088-ec61d464b74c diff --git a/mainwin.cc b/mainwin.cc index bf26c8a..d9cf907 100644 --- a/mainwin.cc +++ b/mainwin.cc @@ -561,7 +561,7 @@ fail: void MainWindow::actionNew() { -#if ENABLE_MDI +#ifdef ENABLE_MDI new MainWindow; #else filename = QString(); @@ -576,7 +576,7 @@ void MainWindow::actionOpen() QString new_filename = QFileDialog::getOpenFileName(this, "Open File", "", "OpenSCAD Designs (*.scad)"); if (!new_filename.isEmpty()) { -#if ENABLE_MDI +#ifdef ENABLE_MDI if (!editor->toPlainText().isEmpty()) { new MainWindow(new_filename.toAscii().data()); current_win = NULL; @@ -1359,7 +1359,7 @@ void MainWindow::dropEvent(QDropEvent *event) if (urls[i].scheme() != "file") continue; QString fn = urls[i].path(); -#if ENABLE_MDI +#ifdef ENABLE_MDI if (!editor->toPlainText().isEmpty()) { new MainWindow(fn.toAscii().data()); break; diff --git a/openscad.pro b/openscad.pro index 00d607d..d569693 100644 --- a/openscad.pro +++ b/openscad.pro @@ -11,9 +11,9 @@ CONFIG += qt debug TEMPLATE = app # MDI needs an OpenCSG library that is compiled with OpenCSG-Reset-Hack.patch applied -# DEFINES += "ENABLE_MDI=1" +# DEFINES += ENABLE_MDI -DEFINES += "ENABLE_CGAL=1" +DEFINES += ENABLE_CGAL LIBS += -lCGAL macx { @@ -26,7 +26,7 @@ else { LIBS += -lmpfr } -DEFINES += "ENABLE_OPENCSG=1" +DEFINES += ENABLE_OPENCSG LIBS += -lopencsg unix:LIBS += -lGLEW -- cgit v0.10.1