CHanged to build order,

this is NOT complete and will not build yet!
LibreCAD · Feb 16, 2012 · 4ca89c9 · 4ca89c9
1 parent 839912d
commit 4ca89c9
Show file tree

Hide file tree

Showing 11 changed files with 136 additions and 211 deletions.
diff --git a/common.pro b/common.pro
@@ -1,11 +1,49 @@
 
-# Common project definitions for LibreCAD. This file gets
-# included from the various *.pro files.
 
+# Store intermedia stuff somewhere else
+OBJECTS_DIR = generated/obj
+MOC_DIR = generated/moc
+RCC_DIR = generated/rcc
+TS_DIR = generated/ts
+UI_DIR = generated/ui
+UI_HEADERS_DIR = generated/ui
+UI_SOURCES_DIR = generated/ui
 
+# Copy command
+win32 {
+    COPY = copy /y
+} else {
+    COPY = cp
+}
+
+# Compiler settings
+unix {
+    macx {   
+        CONFIG += x86 x86_64
+        SUBDIRS += attf2lff
+    }
+    else {
+        SUBDIRS += attf2lff
+    }
+}
+
+# Installation location
+win32 {
+    INSTALLDIR = windows
+}
+unix {
+    macx { 
+        INSTALLDIR = LibreCAD.app/Contents
+    }
+    else { 
+        INSTALLDIR = unix
+    }
+}
+
+
+# Boost
 win32 {
 
-    boost {
         # Use Boost on Windows.
 
         # Specify where boost is installed (this should have the boost
@@ -31,12 +69,10 @@ win32 {
         # Make boost known to compiler and linker.
         # This should also work on other platforms (but BOOST_LIBS may need
         # to be set to the required boost *.sl/*.so/*.dylib/*.a).
-        DEFINES += HAS_BOOST
         INCLUDEPATH += "$${BOOST_DIR}"
         LIBS += -L"$${BOOST_DIR}/lib" $${BOOST_LIBS}
         HEADERS += "$${BOOST_DIR}"
         !build_pass:verbose:message(Using boost libraries in $${BOOST_DIR}.)
-    }
 
     # On windows, check for MSVC compilers - they need help on C99 
     # features and a hint to povide M_PI et al.
@@ -54,7 +90,10 @@ win32 {
 }
 
 macx {
-    boost {
+        !exists( /opt/local/lib/libboost* ) {
+            error(Boost was not found, please install boost!)
+        }
+
         # Use Boost on OSX
 	# Install boost with : sudo port install boost
 
@@ -75,10 +114,10 @@ macx {
         # Make boost known to compiler and linker.
         # This should also work on other platforms (but BOOST_LIBS may need
         # to be set to the required boost *.sl/*.so/*.dylib/*.a).
-        DEFINES += HAS_BOOST
         INCLUDEPATH += $${BOOST_DIR}
+	# HEADERS += $${BOOST_DIR}
         LIBS += -L/opt/local/lib $${BOOST_LIBS}
-        !build_pass:verbose:message(Using boost libraries in $${BOOST_DIR}.)
-    }
+        # !build_pass:verbose:message(Using boost libraries in $${BOOST_DIR}.)
+        message(Using boost libraries in $${BOOST_DIR}.)
 }
 
diff --git a/libraries/dxflib/dxflib.pro b/libraries/dxflib/dxflib.pro
@@ -7,28 +7,19 @@
 QT       -= core gui
 TEMPLATE = lib
 
-#CONFIG += dll \
-CONFIG += static \
-    warn_on
+CONFIG += static warn_on
+
+DESTDIR = ../../generated/lib
 
 VERSION = 2.2.0.0
 
 DLL_NAME = dxflib
 TARGET = $$DLL_NAME
 
 # Use common project definitions.
-include(../common.pro)
-
-# DEFINES +=
-
-win32 {
-    COPY = copy /y
-} else {
-    COPY = cp
-}
-macx {
-    CONFIG += x86 x86_64
-}
+include(../../settings.pro)
+include(../../common.pro)
+
 SOURCES += \
     src/dl_dxf.cpp \
     src/dl_writer_ascii.cpp
@@ -46,14 +37,3 @@ HEADERS += \
     src/dl_writer_ascii.h
 
 
-DESTDIR = ../intermediate
-
-# Store intermedia stuff somewhere else
-OBJECTS_DIR = ../intermediate/obj
-MOC_DIR = ../intermediate/moc
-RCC_DIR = ../intermediate/rcc
-TS_DIR = ../intermediate/ts
-UI_DIR = ../intermediate/ui
-UI_HERADERS_DIR = ../intermediate/ui
-UI_SOURCES_DIR = ../intermediate/ui
-
diff --git a/libraries/fparser/fparser.pro b/libraries/fparser/fparser.pro
@@ -7,43 +7,22 @@
 QT       -= core gui
 TEMPLATE = lib
 
-#CONFIG += dll \
-CONFIG += static \
-    warn_on
+CONFIG += static warn_on
 
-VERSION = 4.3
+DESTDIR = ../../generated/lib
 
-# Use common project definitions.
-include(../common.pro)
+VERSION = 4.3
 
 DLL_NAME = fparser
 TARGET = $$DLL_NAME
 
-# DEFINES +=
+# Use common project definitions.
+include(../../settings.pro)
+include(../../common.pro)
 
-win32 {
-    COPY = copy /y
-} else {
-    COPY = cp
-}
-macx {
-    CONFIG += x86 x86_64
-}
 SOURCES += \
     fparser.cc
 
 HEADERS += \
     fparser.hh
 
-
-DESTDIR = ../intermediate
-
-# Store intermedia stuff somewhere else
-OBJECTS_DIR = ../intermediate/obj
-MOC_DIR = ../intermediate/moc
-RCC_DIR = ../intermediate/rcc
-TS_DIR = ../intermediate/ts
-UI_DIR = ../intermediate/ui
-UI_HERADERS_DIR = ../intermediate/ui
-UI_SOURCES_DIR = ../intermediate/ui
-
diff --git a/libraries/jwwlib/jwwlib.pro b/libraries/jwwlib/jwwlib.pro
@@ -7,28 +7,19 @@
 QT       -= core gui
 TEMPLATE = lib
 
-#CONFIG += dll \
-CONFIG += static \
-    warn_on
+CONFIG += static warn_on
 
-VERSION = 0.0.1
+DESTDIR = ../../generated/lib
 
-# Use common project definitions.
-include(../common.pro)
+VERSION = 0.0.1
 
 DLL_NAME = jwwlib
 TARGET = $$DLL_NAME
 
-# DEFINES +=
+# Use common project definitions.
+include(../../settings.pro)
+include(../../common.pro)
 
-win32 {
-    COPY = copy /y
-} else {
-    COPY = cp
-}
-macx {
-    CONFIG += x86 x86_64
-}
 INCLUDEPATH += \
     ../dxflib/src
 
@@ -42,14 +33,3 @@ HEADERS += \
     ../jwwlib/src/jwwdoc.h
 
 
-DESTDIR = ../intermediate
-
-# Store intermedia stuff somewhere else
-OBJECTS_DIR = ../intermediate/obj
-MOC_DIR = ../intermediate/moc
-RCC_DIR = ../intermediate/rcc
-TS_DIR = ../intermediate/ts
-UI_DIR = ../intermediate/ui
-UI_HERADERS_DIR = ../intermediate/ui
-UI_SOURCES_DIR = ../intermediate/ui
-
diff --git a/libraries/libdxfrw/libdxfrw.pro b/libraries/libdxfrw/libdxfrw.pro
@@ -7,29 +7,20 @@
 QT       -= core gui
 TEMPLATE = lib
 
-#CONFIG += dll \
-CONFIG += static \
-    warn_on
+CONFIG += static warn_on
 
-VERSION = 0.0.1
+DESTDIR = ../../generated/lib
 
-# Use common project definitions.
-include(../common.pro)
+VERSION = 0.0.1
 
 DLL_NAME = dxfrw
 TARGET = $$DLL_NAME
 
-DEFINES += DRW_DBG
-
-win32 {
-    COPY = copy /y
-} else {
-    COPY = cp
-}
+# Use common project definitions.
+include(../../settings.pro)
+include(../../common.pro)
 
-macx { 
-    CONFIG += x86 x86_64
-}
+DEFINES += DRW_DBG
 
 SOURCES += \
     src/libdxfrw.cpp \
@@ -47,14 +38,3 @@ HEADERS += \
     src/dxfwriter.h \
     src/drw_interface.h
 
-DESTDIR = ../intermediate
-
-# Store intermedia stuff somewhere else
-OBJECTS_DIR = ../intermediate/obj
-MOC_DIR = ../intermediate/moc
-RCC_DIR = ../intermediate/rcc
-TS_DIR = ../intermediate/ts
-UI_DIR = ../intermediate/ui
-UI_HERADERS_DIR = ../intermediate/ui
-UI_SOURCES_DIR = ../intermediate/ui
-
diff --git a/libraries/libraries.pro b/libraries/libraries.pro
@@ -0,0 +1,17 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2011-03-22T19:33:11
+#
+#-------------------------------------------------
+
+TEMPLATE = subdirs
+
+TARGET = libraries
+
+SUBDIRS     = \
+        libdxfrw \
+        dxflib \
+        jwwlib \
+        fparser
+
+
diff --git a/librecad.pro b/librecad.pro
@@ -8,39 +8,10 @@ TEMPLATE = subdirs
 TARGET = librecad
 
 CONFIG += ordered
-#QT += gui
 
 SUBDIRS     = \
-        libdxfrw \
-        dxflib \
-        jwwlib \
-        fparser \
-        src \
-        plugins
-
-unix {
-    macx {   
-	CONFIG += x86 x86_64
-    }
-    else {
-        SUBDIRS += attf2lff
-    }
-}
-
-TRANSLATIONS =
-
-# install
-win32 {
-    INSTALLDIR = release
-}
-unix {
-    macx { 
-        INSTALLDIR = LibreCAD.app/Contents
-    }
-    else { 
-#        INSTALLDIR = unix
-    }
-}
-
+    libraries \
+    librecad
+#        plugins
 
 exists( custom.pro ):include( custom.pro )
diff --git a/librecad/librecad.pro b/librecad/librecad.pro
@@ -0,0 +1,11 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2011-03-22T19:33:11
+#
+#-------------------------------------------------
+
+TEMPLATE = subdirs
+
+TARGET = librecad
+
+SUBDIRS = src