Reorganize source files

qmake/foug_datax.pro

@@ -1,137 +0,0 @@
-isEmpty(PREFIX_DIR) {
-  PREFIX_DIR = ..
-}
-
-include(config.pri)
-
-message($$PREFIX_DIR)
-
-TEMPLATE = lib
-TARGET = fougdatax-c$$TARGET_SUFFIX
-DESTDIR = $$PREFIX_DIR/lib
-
-QT =
-
-DATAX += stl qt4_support occ_support
-
-dll:DEFINES *= FOUG_LIB_DLL \
-               FOUG_LIB_MAKE_DLL
-
-#*g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
-#*g++*:QMAKE_CXXFLAGS_RELEASE += -O3
-
-INCLUDEPATH += ../src
-
-HEADERS += \
-    ../src/c/endian.h \
-    ../src/c/error.h \
-    ../src/c/global.h \
-    ../src/c/memory.h \
-    ../src/c/stream.h \
-    ../src/c/task_control.h \
-    ../src/c/transfer.h \
-
-SOURCES += \
-    ../src/c/endian.c \
-    ../src/c/error.c \
-    ../src/c/stream.c \
-    ../src/c/task_control.c
-
-*-g++*:QMAKE_CFLAGS += -ansi -pedantic-errors
-*-msvc*:QMAKE_CFLAGS += -TC
-
-global_inc.path  = $$PREFIX_DIR/include/datax
-global_inc.files = ../src/*.h
-c_global_inc.path  = $$PREFIX_DIR/include/datax/c
-c_global_inc.files = ../src/c/*.h
-INSTALLS += global_inc  c_global_inc
-
-# libSTL
-contains(DATAX, stl) {
-  dll:DEFINES *= FOUG_DATAX_LIBSTL_DLL \
-                 FOUG_DATAX_LIBSTL_MAKE_DLL
-
-  HEADERS += \
-    ../src/c/libstl/stl_global.h \
-    ../src/c/libstl/stla_read.h \
-    ../src/c/libstl/stla_write.h \
-    ../src/c/libstl/stlb_read.h \
-    ../src/c/libstl/stlb_write.h \
-    ../src/c/libstl/stl_triangle.h \
-    ../src/c/libstl/stlb_triangle.h
-
-  SOURCES += \
-    ../src/c/libstl/stla_read.c \
-    ../src/c/libstl/stla_write.c \
-    ../src/c/libstl/stlb_read.c \
-    ../src/c/libstl/stlb_write.c
-
-  c_libstl_inc.path  = $$PREFIX_DIR/include/datax/c/libstl
-  c_libstl_inc.files = ../src/c/libstl/*.h
-  INSTALLS += c_libstl_inc
-} # contains(DATAX, stl)
-
-# libSupport
-HAS_SUPPORT = $$find(DATAX, support)
-!isEmpty(HAS_SUPPORT) {
-  HEADERS += ../src/c/support/support_global.h
-  dll:DEFINES *= FOUG_LIBSUPPORT_DLL \
-                 FOUG_LIBSUPPORT_MAKE_DLL
-  support_inc.path  = $$PREFIX_DIR/include/datax/c/support
-  support_inc.files = ../src/c/support/support_global.h
-  INSTALLS += support_inc
-} # !isEmpty(HAS_SUPPORT)
-
-# qt4_support
-contains(DATAX, qt4_support) {
-  HEADERS += ../src/c/support/qt4_stream.h
-  SOURCES += ../src/c/support/qt4_stream.cpp
-
-  QT = core
-
-  qt4_support_inc.path  = $$PREFIX_DIR/include/datax/c/support
-  qt4_support_inc.files = ../src/c/support/qt4_stream.h
-  INSTALLS += qt4_support_inc
-} # contains(DATAX, qt4_support)
-
-# occ_support
-contains(DATAX, occ_support) {
-  isEmpty(CASCADE_ROOT):error(Variable CASCADE_ROOT is not defined)
-
-  INCLUDEPATH += $$CASCADE_ROOT/inc
-
-  win32-*:DEFINES *= WNT
-  linux-*:DEFINES *= LIN LININTEL OCC_CONVERT_SIGNALS
-  *-64:DEFINES *= _OCC64
-  !win32:DEFINES *= HAVE_CONFIG_H \
-                   HAVE_FSTREAM \
-                   HAVE_IOSTREAM \
-                   HAVE_IOMANIP \
-                   HAVE_LIMITS_H
-
-  HEADERS += ../src/c/support/occ_libstl.h
-  SOURCES += ../src/c/support/occ_libstl.cpp
-
-  CASCADE_LIBPATH =
-  unix:CASCADE_LIBPATH = $$CASCADE_ROOT/lib
-  CONFIG(debug, debug|release) {
-    win32-msvc2005:CASCADE_LIBPATH = $$CASCADE_ROOT/win32/vc8/libd
-    win32-msvc2008:CASCADE_LIBPATH = $$CASCADE_ROOT/win32/vc9/lib
-    win32-msvc2010:CASCADE_LIBPATH = $$CASCADE_ROOT/win32/vc10/libd
-  } else {
-    win32-msvc2005:CASCADE_LIBPATH = $$CASCADE_ROOT/win32/vc8/lib
-    win32-msvc2008:CASCADE_LIBPATH = $$CASCADE_ROOT/win32/vc9/lib
-    win32-msvc2010:CASCADE_LIBPATH = $$CASCADE_ROOT/win32/vc10/lib
-  }
-
-  LIBS += -L$$CASCADE_LIBPATH -lTKSTL -lTKernel -lTKMath
-  QMAKE_RPATHDIR += $$CASCADE_LIBPATH
-
-  occ_support_inc.path  = $$PREFIX_DIR/include/datax/c/support
-  occ_support_inc.files = ../src/c/support/occ_libstl.h
-  INSTALLS += occ_support_inc
-} # contains(DATAX, occ_support)
-
-#VER_MAJ = 0
-#VER_MIN = 1
-#VER_PAT = 0

qmake/fougdatax.pro

@@ -0,0 +1,133 @@
+isEmpty(PREFIX_DIR) {
+  PREFIX_DIR = ..
+}
+
+include(config.pri)
+
+message($$PREFIX_DIR)
+
+TEMPLATE = lib
+TARGET = fougdatax$$TARGET_SUFFIX
+DESTDIR = $$PREFIX_DIR/lib
+
+QT =
+
+DATAX += stl
+
+dll:DEFINES += FOUG_LIB_DLL \
+               FOUG_LIB_MAKE_DLL
+
+#*g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
+#*g++*:QMAKE_CXXFLAGS_RELEASE += -O3
+
+HEADERS += \
+    ../src/endian.h \
+    ../src/error.h \
+    ../src/global.h \
+    ../src/memory.h \
+    ../src/stream.h \
+    ../src/task_control.h \
+    ../src/transfer.h \
+
+SOURCES += \
+    ../src/endian.c \
+    ../src/error.c \
+    ../src/stream.c \
+    ../src/task_control.c
+
+*-g++*:QMAKE_CFLAGS += -ansi -pedantic-errors
+*-msvc*:QMAKE_CFLAGS += -TC
+
+global_inc.path  = $$PREFIX_DIR/include/datax
+global_inc.files = ../src/*.h
+INSTALLS += global_inc
+
+# libSTL
+contains(DATAX, stl) {
+  dll:DEFINES += FOUG_DATAX_LIBSTL_DLL \
+                 FOUG_DATAX_LIBSTL_MAKE_DLL
+
+  HEADERS += \
+    ../src/libstl/stl_global.h \
+    ../src/libstl/stla_read.h \
+    ../src/libstl/stla_write.h \
+    ../src/libstl/stlb_read.h \
+    ../src/libstl/stlb_write.h \
+    ../src/libstl/stl_triangle.h \
+    ../src/libstl/stlb_triangle.h
+
+  SOURCES += \
+    ../src/libstl/stla_read.c \
+    ../src/libstl/stla_write.c \
+    ../src/libstl/stlb_read.c \
+    ../src/libstl/stlb_write.c
+
+  libstl_inc.path  = $$PREFIX_DIR/include/datax/libstl
+  libstl_inc.files = ../src/libstl/*.h
+  INSTALLS += libstl_inc
+} # contains(DATAX, stl)
+
+# libSupport
+HAS_SUPPORT = $$find(DATAX, support)
+!isEmpty(HAS_SUPPORT) {
+  HEADERS += ../src/support/support_global.h
+  dll:DEFINES += FOUG_LIBSUPPORT_DLL \
+                 FOUG_LIBSUPPORT_MAKE_DLL
+  support_inc.path  = $$PREFIX_DIR/include/datax/support
+  support_inc.files = ../src/support/support_global.h
+  INSTALLS += support_inc
+} # !isEmpty(HAS_SUPPORT)
+
+# qt4_support
+contains(DATAX, qt4_support) {
+  HEADERS += ../src/support/qt4_stream.h
+  SOURCES += ../src/support/qt4_stream.cpp
+
+  QT = core
+
+  qt4_support_inc.path  = $$PREFIX_DIR/include/datax/support
+  qt4_support_inc.files = ../src/support/qt4_stream.h
+  INSTALLS += qt4_support_inc
+} # contains(DATAX, qt4_support)
+
+# occ_support
+contains(DATAX, occ_support) {
+  isEmpty(CASCADE_ROOT):error(Variable CASCADE_ROOT is not defined)
+
+  INCLUDEPATH += $$CASCADE_ROOT/inc
+
+  win32-*:DEFINES += WNT
+  linux-*:DEFINES += LIN LININTEL OCC_CONVERT_SIGNALS
+  *-64:DEFINES += _OCC64
+  !win32:DEFINES += HAVE_CONFIG_H \
+                    HAVE_FSTREAM \
+                    HAVE_IOSTREAM \
+                    HAVE_IOMANIP \
+                    HAVE_LIMITS_H
+
+  HEADERS += ../src/support/occ_libstl.h
+  SOURCES += ../src/support/occ_libstl.cpp
+
+  CASCADE_LIBPATH =
+  unix:CASCADE_LIBPATH = $$CASCADE_ROOT/lib
+  CONFIG(debug, debug|release) {
+    win32-msvc2005:CASCADE_LIBPATH = $$CASCADE_ROOT/win32/vc8/libd
+    win32-msvc2008:CASCADE_LIBPATH = $$CASCADE_ROOT/win32/vc9/lib
+    win32-msvc2010:CASCADE_LIBPATH = $$CASCADE_ROOT/win32/vc10/libd
+  } else {
+    win32-msvc2005:CASCADE_LIBPATH = $$CASCADE_ROOT/win32/vc8/lib
+    win32-msvc2008:CASCADE_LIBPATH = $$CASCADE_ROOT/win32/vc9/lib
+    win32-msvc2010:CASCADE_LIBPATH = $$CASCADE_ROOT/win32/vc10/lib
+  }
+
+  LIBS += -L$$CASCADE_LIBPATH -lTKSTL -lTKernel -lTKMath
+  QMAKE_RPATHDIR += $$CASCADE_LIBPATH
+
+  occ_support_inc.path  = $$PREFIX_DIR/include/datax/support
+  occ_support_inc.files = ../src/support/occ_libstl.h
+  INSTALLS += occ_support_inc
+} # contains(DATAX, occ_support)
+
+#VER_MAJ = 0
+#VER_MIN = 1
+#VER_PAT = 0