caiyu/gmio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename foug_dataex to foug_datax

Browse Source
This commit is contained in:
Hugues Delorme 2013-03-04 22:04:21 +01:00
parent dbdb45bd24
commit 85b616e84b
8 changed files with 46 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
CMakeLists.txt
View File

@ -1,7 +1,9 @@
cmake_minimum_required(VERSION 2.6)
include(CheckIncludeFiles)
include(CheckSymbolExists)
include(CheckCSourceCompiles)
project(foug_dataex C)
project(foug_datax C)
# Allow the user to build a static library
option(BUILD_SHARED_LIBS "Build shared libraries (DLL)" ON)
@ -15,10 +17,23 @@ check_include_files(stdint.h HAVE_STDINT_H)
configure_file(src/c/config.h.cmake config.h @ONLY)
include_directories(${CMAKE_BINARY_DIR}) # For generated "config.h"
# Have fabsf() ?
#check_symbol_exists(fabs "math.h" HAVE_FABS)
#check_symbol_exists(fabsf "math.h" HAVE_FABSF)
#check_c_source_compiles("
# #include <math.h>
# int main()
# {
# fabsf(-1);
# return 0;
# }"
# HAVE_FABSF)
# Specific flags for gcc
if(CMAKE_COMPILER_IS_GNUCC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ansi -pedantic-errors")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra -fstrict-aliasing -Wstrict-aliasing -Wcast-align -Wlogical-op -Wfloat-equal")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ansi -pedantic-errors -fstrict-aliasing")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra -Wstrict-aliasing -Wcast-align -Wlogical-op -Wfloat-equal")
endif()
# Specific flags for Visual C++
@ -29,18 +44,18 @@ endif()
if(BUILD_SHARED_LIBS)
add_definitions(-DFOUG_LIB_DLL
-DFOUG_LIB_MAKE_DLL
-DFOUG_DATAEX_LIBSTL_DLL
-DFOUG_DATAEX_LIBSTL_MAKE_DLL)
-DFOUG_DATAX_LIBSTL_DLL
-DFOUG_DATAX_LIBSTL_MAKE_DLL)
endif()
# Declare installs
install(FILES ${CMAKE_BINARY_DIR}/config.h DESTINATION include/dataex/c)
install(FILES ${CMAKE_BINARY_DIR}/config.h DESTINATION include/datax/c)
file(GLOB C_GLOBAL_HEADERS src/c/*.h)
install(FILES ${C_GLOBAL_HEADERS} DESTINATION include/dataex/c)
install(FILES ${C_GLOBAL_HEADERS} DESTINATION include/datax/c)
file(GLOB C_LIBSTL_HEADERS src/c/libstl/*.h)
install(FILES ${C_LIBSTL_HEADERS} DESTINATION include/dataex/c/libstl)
install(FILES ${C_LIBSTL_HEADERS} DESTINATION include/datax/c/libstl)
install(TARGETS fougstl-c
RUNTIME DESTINATION lib

8
qmake.build/c++/libstl/libstl.pro
View File

@ -41,13 +41,13 @@ SOURCES += \
../../../src/c++/libstl/stlb.cpp \
../../../src/c++/libstl/stla.cpp
global_inc.path = $$PREFIX_DIR/include/dataex
global_inc.path = $$PREFIX_DIR/include/datax
global_inc.files = ../../../src/*.h
cpp_global_inc.path = $$PREFIX_DIR/include/dataex/c++
cpp_global_inc.path = $$PREFIX_DIR/include/datax/c++
cpp_global_inc.files = ../../../src/c++/*.h
cpp_streams_inc.path = $$PREFIX_DIR/include/dataex/c++/streams
cpp_streams_inc.path = $$PREFIX_DIR/include/datax/c++/streams
cpp_streams_inc.files = ../../../src/c++/streams/*.h
cpp_libstl_inc.path = $$PREFIX_DIR/include/dataex/c++/libstl
cpp_libstl_inc.path = $$PREFIX_DIR/include/datax/c++/libstl
cpp_libstl_inc.files = ../../../src/c++/libstl/*.h
INSTALLS += global_inc cpp_global_inc cpp_streams_inc cpp_libstl_inc

8
qmake.build/c/libstl/libstl.pro
View File

@ -12,7 +12,7 @@ DESTDIR = $$PREFIX_DIR/lib
dll {
DEFINES *= FOUG_LIB_DLL FOUG_LIB_MAKE_DLL
DEFINES *= FOUG_DATAEX_LIBSTL_DLL FOUG_DATAEX_LIBSTL_MAKE_DLL
DEFINES *= FOUG_DATAX_LIBSTL_DLL FOUG_DATAX_LIBSTL_MAKE_DLL
}
#*g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
@ -44,11 +44,11 @@ SOURCES += \
*-g++*:QMAKE_CFLAGS += -ansi -pedantic-errors
*-msvc*:QMAKE_CFLAGS += -TC
global_inc.path = $$PREFIX_DIR/include/dataex
global_inc.path = $$PREFIX_DIR/include/datax
global_inc.files = ../../../src/*.h
c_global_inc.path = $$PREFIX_DIR/include/dataex/c
c_global_inc.path = $$PREFIX_DIR/include/datax/c
c_global_inc.files = ../../../src/c/*.h
c_libstl_inc.path = $$PREFIX_DIR/include/dataex/c/libstl
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

0
qmake.build/foug_dataex.pro → qmake.build/foug_datax.pro
View File

12
src/c/libstl/stl_global.h
View File

@ -3,15 +3,15 @@
#include "../global.h"
#ifdef FOUG_DATAEX_LIBSTL_DLL
# ifdef FOUG_DATAEX_LIBSTL_MAKE_DLL
# define FOUG_DATAEX_LIBSTL_EXPORT FOUG_DECL_EXPORT
#ifdef FOUG_DATAX_LIBSTL_DLL
# ifdef FOUG_DATAX_LIBSTL_MAKE_DLL
# define FOUG_DATAX_LIBSTL_EXPORT FOUG_DECL_EXPORT
# else
# define FOUG_DATAEX_LIBSTL_EXPORT FOUG_DECL_IMPORT
# define FOUG_DATAX_LIBSTL_EXPORT FOUG_DECL_IMPORT
# endif /* APP_LIBCORE_MAKE_DLL */
#else
# define FOUG_DATAEX_LIBSTL_EXPORT
#endif /* FOUG_DATAEX_LIBSTL_DLL */
# define FOUG_DATAX_LIBSTL_EXPORT
#endif /* FOUG_DATAX_LIBSTL_DLL */
/* STLB */
#define FOUG_STLB_HEADER_SIZE 80

8
src/c/libstl/stla_read.h
View File

@ -28,9 +28,15 @@ typedef struct foug_stla_read_args
size_t data_size_hint;
} foug_stla_read_args_t;
FOUG_DATAEX_LIBSTL_EXPORT
FOUG_DATAX_LIBSTL_EXPORT
int foug_stla_read(foug_stla_read_args_t* args);
#define FOUG_DATAX_NO_ERROR 0
#define FOUG_DATAX_NULL_BUFFER -1
#define FOUG_DATAX_INVALID_BUFFER_SIZE_ERROR -2
#define FOUG_DATAX_STREAM_ERROR -3
#define FOUG_DATAX_TASK_STOPPED_ERROR -4
/* Error codes returned by foug_stlb_read() */
#define FOUG_STLA_READ_NO_ERROR 0
#define FOUG_STLA_READ_NULL_BUFFER 3

2
src/c/libstl/stlb_read.h
View File

@ -27,7 +27,7 @@ typedef struct foug_stlb_read_args
uint32_t buffer_size;
} foug_stlb_read_args_t;
FOUG_DATAEX_LIBSTL_EXPORT
FOUG_DATAX_LIBSTL_EXPORT
int foug_stlb_read(foug_stlb_read_args_t* args);
/* Error codes returned by foug_stlb_read() */

2
src/c/libstl/stlb_write.h
View File

@ -26,7 +26,7 @@ typedef struct foug_stlb_write_args
uint32_t buffer_size;
} foug_stlb_write_args_t;
FOUG_DATAEX_LIBSTL_EXPORT
FOUG_DATAX_LIBSTL_EXPORT
int foug_stlb_write(foug_stlb_write_args_t* args);
/* Error codes returned by foug_stlb_write() */