Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
libaec
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Mathis Rosenhauer
libaec
Commits
ed9ebe82
Commit
ed9ebe82
authored
Jul 29, 2014
by
Mathis Rosenhauer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Next attempt to tackle DLLs.
parent
2a4b99e8
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
13 deletions
+13
-13
CMakeLists.txt
CMakeLists.txt
+7
-6
cmake/config.h.in
cmake/config.h.in
+0
-1
src/CMakeLists.txt
src/CMakeLists.txt
+4
-4
src/libaec.h
src/libaec.h
+2
-2
No files found.
CMakeLists.txt
View file @
ed9ebe82
...
...
@@ -26,14 +26,15 @@ CONFIGURE_FILE(
ADD_DEFINITIONS
(
"-DHAVE_CONFIG_H"
)
# Allow the developer to select if Dynamic or Static libraries are built
OPTION
(
BUILD_SHARED_LIBS
"Build Shared Libraries"
OFF
)
IF
(
BUILD_SHARED_LIBS
)
# User wants to build Dynamic Libraries,
# so change the LIB_TYPE variable to CMake keyword 'SHARED'
OPTION
(
BUILD_SHARED_LIBS
"Build Shared Libraries"
ON
)
IF
(
BUILD_SHARED_LIBS
)
SET
(
LIB_TYPE SHARED
)
ELSE
(
BUILD_SHARED_LIBS
)
SET
(
LIB_TYPE STATIC
)
ENDIF
(
BUILD_SHARED_LIBS
)
IF
(
WIN32
)
MESSAGE
(
WARNING
"You will have to modify libaec.h for static libs."
)
ENDIF
(
WIN32
)
SET
(
LIB_TYPE STATIC
)
ENDIF
(
BUILD_SHARED_LIBS
)
INCLUDE_DIRECTORIES
(
"
${
PROJECT_BINARY_DIR
}
"
)
INCLUDE_DIRECTORIES
(
"
${
PROJECT_BINARY_DIR
}
/src"
)
...
...
cmake/config.h.in
View file @
ed9ebe82
...
...
@@ -3,4 +3,3 @@
#cmakedefine WORDS_BIGENDIAN 1
#cmakedefine HAVE_DECL___BUILTIN_CLZLL 1
#cmakedefine HAVE_BSR64 1
#cmakedefine BUILD_SHARED_LIBS 1
src/CMakeLists.txt
View file @
ed9ebe82
...
...
@@ -11,10 +11,10 @@ SET_TARGET_PROPERTIES(sz PROPERTIES
)
TARGET_LINK_LIBRARIES
(
sz aec
)
IF
(
WIN32
)
SET_TARGET_PROPERTIES
(
aec PROPERTIES DEFINE_SYMBOL
"
DLL_EXPORT
"
)
SET_TARGET_PROPERTIES
(
sz PROPERTIES DEFINE_SYMBOL
"
DLL_EXPORT
"
)
ENDIF
(
WIN32
)
IF
(
WIN32
AND BUILD_SHARED_LIBS
)
SET_TARGET_PROPERTIES
(
aec PROPERTIES DEFINE_SYMBOL
"
AECDLL_EXPORTS
"
)
SET_TARGET_PROPERTIES
(
sz PROPERTIES DEFINE_SYMBOL
"
AECDLL_EXPORTS
"
)
ENDIF
(
WIN32
AND BUILD_SHARED_LIBS
)
ADD_EXECUTABLE
(
aec_client aec.c
)
SET_TARGET_PROPERTIES
(
aec_client PROPERTIES OUTPUT_NAME
"aec"
)
...
...
src/libaec.h
View file @
ed9ebe82
...
...
@@ -55,8 +55,8 @@
#include <stddef.h>
#if _WIN32
&& BUILD_SHARED_LIBS
# ifdef
DLL_EXPORT
#if _WIN32
# ifdef
AECDLL_EXPORTS
# define AEC_SCOPE __declspec(dllexport)
# else
# define AEC_SCOPE extern __declspec(dllimport)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment