Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,6 @@ include_directory = include_directories('include')
filesystem_proj = subproject('filesystem')
filesystem_dep = filesystem_proj.get_variable('filesystem_dep')

default_library = get_option('default_library')
if default_library != 'static' and host_machine.system() == 'windows'
dll_build_args = ['-DTMP_BUILDING_DLL']
else
dll_build_args = []
endif

tmp = library(
'tmp',
'src/create.cpp',
Expand All @@ -27,7 +20,6 @@ tmp = library(
gnu_symbol_visibility: 'hidden',
version: meson.project_version(),
dependencies: [filesystem_dep],
cpp_args: dll_build_args,
)

tmp_dep = declare_dependency(
Expand Down
4 changes: 0 additions & 4 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,4 @@ target_include_directories(${PROJECT_NAME}
PUBLIC "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")

if(BUILD_SHARED_LIBS)
target_compile_definitions(${PROJECT_NAME} PRIVATE TMP_BUILDING_DLL)
endif()

add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
7 changes: 2 additions & 5 deletions src/abi.hpp
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
#ifndef TMP_ABI_H
#define TMP_ABI_H

#if defined _WIN32
#if defined TMP_BUILDING_DLL
#ifdef _WIN32
#define abi __declspec(dllexport)
#else
#define abi
#endif
#else
#define abi __attribute__((visibility("default")))
#endif

namespace tmp {

class abi directory;
class abi file;
} // namespace tmp
Expand Down