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

Fix remaining compiler errors since renaming the library to 'gmio'

Browse Source
This commit is contained in:
Hugues Delorme 2014-04-17 10:19:23 +02:00
parent 2b94d317bc
commit 7d853cc3b1
3 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -18,11 +18,11 @@ file(GLOB ALL_SRC_FILES src/gmio_core/* src/gmio_core/internal/*)
set(ALL_SRC_FILES ${ALL_SRC_FILES}) set(ALL_SRC_FILES ${ALL_SRC_FILES})
# Have <stdint.h> ? # Have <stdint.h> ?
check_include_files(stdint.h FOUG_HAVE_STDINT_H) check_include_files(stdint.h GMIO_HAVE_STDINT_H)
# Have strtof() ? # Have strtof() ?
if(NOT BUILD_STRICT_C90) if(NOT BUILD_STRICT_C90)
check_function_exists(strtof FOUG_HAVE_STRTOF_FUNC) check_function_exists(strtof GMIO_HAVE_STRTOF_FUNC)
endif() endif()
# Have builtin byte swap functions ? # Have builtin byte swap functions ?
@ -30,13 +30,13 @@ if(CMAKE_COMPILER_IS_GNUCC)
# __builtin_bswap16() is missing in x86 GCC version prior to v4.7 # __builtin_bswap16() is missing in x86 GCC version prior to v4.7
# See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52624 # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52624
check_c_source_compiles("int main() { return (int)__builtin_bswap16(0x1122); }" check_c_source_compiles("int main() { return (int)__builtin_bswap16(0x1122); }"
FOUG_HAVE_GCC_BUILTIN_BSWAP16_FUNC) GMIO_HAVE_GCC_BUILTIN_BSWAP16_FUNC)
check_c_source_compiles("int main() { return (int)__builtin_bswap32(0x11223344); }" check_c_source_compiles("int main() { return (int)__builtin_bswap32(0x11223344); }"
FOUG_HAVE_GCC_BUILTIN_BSWAP32_FUNC) GMIO_HAVE_GCC_BUILTIN_BSWAP32_FUNC)
elseif(MSVC) elseif(MSVC)
check_c_source_compiles("#include <stdlib.h> check_c_source_compiles("#include <stdlib.h>
int main() { return (int)_byteswap_ulong(0x11223344); }" int main() { return (int)_byteswap_ulong(0x11223344); }"
FOUG_HAVE_MSVC_BUILTIN_BSWAP_FUNC) GMIO_HAVE_MSVC_BUILTIN_BSWAP_FUNC)
endif() endif()
configure_file(src/gmio_core/config.h.cmake config.h @ONLY) configure_file(src/gmio_core/config.h.cmake config.h @ONLY)
@ -60,8 +60,8 @@ if(MSVC)
endif() endif()
if(BUILD_SHARED_LIBS) if(BUILD_SHARED_LIBS)
add_definitions(-DFOUG_LIB_DLL add_definitions(-DGMIO_LIB_DLL
-DFOUG_LIB_MAKE_DLL) -DGMIO_LIB_MAKE_DLL)
endif() endif()
# Declare installs # Declare installs

12
src/gmio_core/config.h.cmake
View File

@ -3,24 +3,12 @@
#ifndef GMIO_CONFIG_H_CMAKE #ifndef GMIO_CONFIG_H_CMAKE
#define GMIO_CONFIG_H_CMAKE #define GMIO_CONFIG_H_CMAKE
#ifndef GMIO_HAVE_STDINT_H
#cmakedefine GMIO_HAVE_STDINT_H #cmakedefine GMIO_HAVE_STDINT_H
#endif
#ifndef GMIO_HAVE_STRTOF_FUNC
#cmakedefine GMIO_HAVE_STRTOF_FUNC #cmakedefine GMIO_HAVE_STRTOF_FUNC
#endif
#ifndef GMIO_HAVE_GCC_BUILTIN_BSWAP16_FUNC
#cmakedefine GMIO_HAVE_GCC_BUILTIN_BSWAP16_FUNC #cmakedefine GMIO_HAVE_GCC_BUILTIN_BSWAP16_FUNC
#endif
#ifndef GMIO_HAVE_GCC_BUILTIN_BSWAP32_FUNC
#cmakedefine GMIO_HAVE_GCC_BUILTIN_BSWAP32_FUNC #cmakedefine GMIO_HAVE_GCC_BUILTIN_BSWAP32_FUNC
#endif
#ifndef GMIO_HAVE_MSVC_BUILTIN_BSWAP_FUNC
#cmakedefine GMIO_HAVE_MSVC_BUILTIN_BSWAP_FUNC #cmakedefine GMIO_HAVE_MSVC_BUILTIN_BSWAP_FUNC
#endif
#endif /* GMIO_CONFIG_H_CMAKE */ #endif /* GMIO_CONFIG_H_CMAKE */

8
src/gmio_support/occ_libstl.h
View File

@ -3,8 +3,8 @@
#include "support_global.h" #include "support_global.h"
#include <Handle_StlMesh_Mesh.hxx> #include <Handle_StlMesh_Mesh.hxx>
struct gmio_stl_geom; struct gmio_stl_mesh;
struct gmio_stl_geom_creator; struct gmio_stl_mesh_creator;
class GMIO_LIBSUPPORT_EXPORT gmio_OccStlMeshDomain class GMIO_LIBSUPPORT_EXPORT gmio_OccStlMeshDomain
{ {
@ -23,9 +23,9 @@ private:
}; };
GMIO_LIBSUPPORT_EXPORT GMIO_LIBSUPPORT_EXPORT
void gmio_stl_occmesh(gmio_stl_geom* geom, const gmio_OccStlMeshDomain& meshCookie); void gmio_stl_occmesh(gmio_stl_mesh* mesh, const gmio_OccStlMeshDomain& meshCookie);
GMIO_LIBSUPPORT_EXPORT GMIO_LIBSUPPORT_EXPORT
void gmio_stl_occmesh_creator(gmio_stl_geom_creator* creator, const Handle_StlMesh_Mesh& mesh); void gmio_stl_occmesh_creator(gmio_stl_mesh_creator* creator, const Handle_StlMesh_Mesh& mesh);
#endif /* GMIO_SUPPORT_OCC_LIBSTL_H */ #endif /* GMIO_SUPPORT_OCC_LIBSTL_H */