diff --git a/qmake.build/c/libstl/libstl.pro b/qmake.build/c/libstl/libstl.pro index 98fc31a..031fea7 100644 --- a/qmake.build/c/libstl/libstl.pro +++ b/qmake.build/c/libstl/libstl.pro @@ -7,13 +7,12 @@ include(../../config.pri) message($$PREFIX_DIR) TEMPLATE = lib -TARGET = fougstl-c$$TARGET_SUFFIX +TARGET = fougdatax-c$$TARGET_SUFFIX DESTDIR = $$PREFIX_DIR/lib -dll { - DEFINES *= FOUG_LIB_DLL FOUG_LIB_MAKE_DLL - DEFINES *= FOUG_DATAX_LIBSTL_DLL FOUG_DATAX_LIBSTL_MAKE_DLL -} +DATAX = stl + +dll:DEFINES *= FOUG_LIB_DLL FOUG_LIB_MAKE_DLL #*g++*:QMAKE_CXXFLAGS_RELEASE -= -O2 #*g++*:QMAKE_CXXFLAGS_RELEASE += -O3 @@ -22,26 +21,17 @@ 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/libstl/stl_global.h \ - ../../../src/c/libstl/stla_read.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 \ - ../../../src/c/error.h + ../../../src/c/task_control.h SOURCES += \ ../../../src/c/endian.c \ + ../../../src/c/error.c \ ../../../src/c/stream.c \ - ../../../src/c/task_control.c \ - ../../../src/c/libstl/stla_read.c \ - ../../../src/c/libstl/stlb_read.c \ - ../../../src/c/libstl/stlb_write.c \ - ../../../src/c/error.c + ../../../src/c/task_control.c *-g++*:QMAKE_CFLAGS += -ansi -pedantic-errors *-msvc*:QMAKE_CFLAGS += -TC @@ -50,9 +40,30 @@ 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 -c_libstl_inc.path = $$PREFIX_DIR/include/datax/c/libstl -c_libstl_inc.files = ../../../src/c/libstl/*.h -INSTALLS += global_inc c_global_inc c_libstl_inc +INSTALLS += global_inc c_global_inc + +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) #VER_MAJ = 0 #VER_MIN = 1