Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Mathis Rosenhauer
libaec
Commits
07c75449
Commit
07c75449
authored
Jul 25, 2014
by
Mathis Rosenhauer
Browse files
Fixed Windows static lib buid.
parent
c7acc822
Changes
3
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
07c75449
...
...
@@ -86,11 +86,12 @@ 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
)
SET
(
LIB_TYPE STATIC
)
IF
(
BUILD_SHARED_LIBS
)
# User wants to build Dynamic Libraries,
# so change the LIB_TYPE variable to CMake keyword 'SHARED'
SET
(
LIB_TYPE SHARED
)
ELSE
(
BUILD_SHARED_LIBS
)
SET
(
LIB_TYPE STATIC
)
ENDIF
(
BUILD_SHARED_LIBS
)
INCLUDE_DIRECTORIES
(
"
${
PROJECT_BINARY_DIR
}
"
)
...
...
config.h.in
View file @
07c75449
...
...
@@ -3,3 +3,4 @@
#cmakedefine WORDS_BIGENDIAN 1
#cmakedefine HAVE_DECL___BUILTIN_CLZLL 1
#cmakedefine HAVE_BSR64 1
#cmakedefine BUILD_SHARED_LIBS 1
src/libaec.h
View file @
07c75449
...
...
@@ -59,15 +59,14 @@
# include <config.h>
#endif
#if
def
_WIN32
#if _WIN32
&& BUILD_SHARED_LIBS
# ifdef DLL_EXPORT
# define AEC_SCOPE
__declspec(dllexport)
# define AEC_SCOPE __declspec(dllexport)
# else
# define AEC_SCOPE
extern __declspec(dllimport)
# define AEC_SCOPE extern __declspec(dllimport)
# endif
#endif
#ifndef AEC_SCOPE
# define AEC_SCOPE extern
#else
# define AEC_SCOPE extern
#endif
struct
internal_state
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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