Merge branch 'next' into cmake2
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 16d1eca..c55c2ec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,17 @@
cmake_minimum_required(VERSION 2.6)
project(capstone)
-# Compile-time options
-# Modify the following options to customize Capstone engine
+set(VERSION_MAJOR 2)
+set(VERSION_MINOR 2)
+set(VERSION_PATCH 0)
+# to configure the options specify them in in the command line or change them in the cmake UI.
+# Don't edit the makefile!
+option(BUILD_STATIC "Build static library" ON)
+option(BUILD_SHARED "Build shared library" ON)
option(BUILD_DIET "Build diet library" OFF)
option(BUILD_TESTS "Build tests" ON)
-option(USE_SYS_DYN_MEM "Use default memory allocation functions" ON)
+option(USE_DEFAULT_ALLOC "Use default memory allocation functions" ON)
option(ARM_SUPPORT "ARM support" ON)
option(ARM64_SUPPORT "ARM64 support" ON)
@@ -15,19 +20,22 @@
option(SPARC_SUPPORT "Sparc support" ON)
option(SYSZ_SUPPORT "SystemZ support" ON)
option(XCORE_SUPPORT "XCore support" ON)
-option(X86_SUPPORT "X86 support" ON)
-option(X86_REDUCE "X86 with reduce instruction sets to minimize library" OFF)
-# End of compile-time option
-# DO NOT modify anything below
+option(X86_SUPPORT "x86 support" ON)
+option(X86_REDUCE "x86 with reduce instruction sets to minimize library" OFF)
-set(VERSION_MAJOR 2)
-set(VERSION_MINOR 1)
-set(VERSION_PATCH 2)
+if (BUILD_DIET)
+ add_definitions(-DCAPSTONE_DIET)
+endif ()
-if (USE_SYS_DYN_MEM)
+if (USE_DEFAULT_ALLOC)
add_definitions(-DCAPSTONE_USE_SYS_DYN_MEM)
endif ()
+if (X86_REDUCE)
+ add_definitions(-DCAPSTONE_X86_REDUCE)
+endif ()
+
+## sources
set(SOURCES
cs.c
MCInst.c
@@ -39,6 +47,7 @@
set(TEST_SOURCES test.c test_detail.c test_skipdata.c)
+## architecture support
if (ARM_SUPPORT)
add_definitions(-DCAPSTONE_HAS_ARM)
set(SOURCES
@@ -90,7 +99,6 @@
if (X86_SUPPORT)
add_definitions(-DCAPSTONE_HAS_X86)
-if (BUILD_DIET)
set(SOURCES
${SOURCES}
arch/X86/X86Disassembler.c
@@ -99,17 +107,9 @@
arch/X86/X86Mapping.c
arch/X86/X86Module.c
)
-else ()
- set(SOURCES
- ${SOURCES}
- arch/X86/X86ATTInstPrinter.c
- arch/X86/X86Disassembler.c
- arch/X86/X86DisassemblerDecoder.c
- arch/X86/X86IntelInstPrinter.c
- arch/X86/X86Mapping.c
- arch/X86/X86Module.c
- )
-endif ()
+ if (NOT BUILD_DIET)
+ set(SOURCES ${SOURCES} arch/X86/X86ATTInstPrinter.c)
+ endif ()
set(TEST_SOURCES ${TEST_SOURCES} test_x86.c)
endif ()
@@ -152,35 +152,54 @@
include_directories("${PROJECT_SOURCE_DIR}/include")
-if (BUILD_DIET)
- add_definitions(-DCAPSTONE_DIET)
+## properties
+# version info
+set_property(GLOBAL PROPERTY VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
+set_property(GLOBAL PROPERTY SOVERSION SOVERSION ${VERSION_MAJOR})
+
+## targets
+if (BUILD_STATIC)
+ add_library(capstone-static STATIC ${SOURCES})
+ set_property(TARGET capstone-static PROPERTY OUTPUT_NAME capstone)
+ set_property(TARGET capstone-static PROPERTY PREFIX lib)
+ set(default-target capstone-static)
endif ()
-if (X86_REDUCE)
- add_definitions(-DCAPSTONE_X86_REDUCE)
+if (BUILD_SHARED)
+ add_library(capstone-shared SHARED ${SOURCES})
+ set_property(TARGET capstone-shared PROPERTY OUTPUT_NAME capstone)
+ set_property(TARGET capstone-shared PROPERTY COMPILE_FLAGS -DCAPSTONE_SHARED)
+
+ if(NOT DEFINED default-target) # honor `capstone-static` for tests first.
+ set(default-target capstone-shared)
+ add_definitions(-DCAPSTONE_SHARED)
+ endif ()
endif ()
-add_library(libcapstone_static STATIC ${SOURCES})
-add_library(libcapstone SHARED ${SOURCES})
-
-set_target_properties(libcapstone PROPERTIES
- VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}
- SOVERSION ${VERSION_MAJOR})
-
if (BUILD_TESTS)
foreach (TSRC ${TEST_SOURCES})
- STRING(REGEX REPLACE ".c$" "" TBIN ${TSRC})
- add_executable(${TBIN} "tests/${TSRC}")
- target_link_libraries(${TBIN} libcapstone_static)
+ STRING(REGEX REPLACE ".c$" "" TBIN ${TSRC})
+ add_executable(${TBIN} "tests/${TSRC}")
+ target_link_libraries(${TBIN} ${default-target})
endforeach ()
endif ()
+## installation
set(INCLUDES arm64.h arm.h capstone.h mips.h ppc.h x86.h sparc.h systemz.h xcore.h)
foreach (INC ${INCLUDES})
install(FILES "include/${INC}" DESTINATION include/capstone)
endforeach ()
-install(TARGETS libcapstone
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib)
+if (BUILD_STATIC)
+ install(TARGETS capstone-static
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib)
+endif ()
+
+if (BUILD_SHARED)
+ install(TARGETS capstone-shared
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib)
+endif ()
diff --git a/Makefile b/Makefile
index 628f37b..1b65d59 100644
--- a/Makefile
+++ b/Makefile
@@ -275,11 +275,25 @@
endif
ifeq ($(CAPSTONE_SHARED),yes)
+ifeq ($(IS_MINGW),1)
+LIBRARY = $(BLDIR)/$(LIBNAME).$(EXT)
+else ifeq ($(IS_CYGWIN),1)
+LIBRARY = $(BLDIR)/$(LIBNAME).$(EXT)
+else # *nix
LIBRARY = $(BLDIR)/lib$(LIBNAME).$(EXT)
endif
+endif
+
ifeq ($(CAPSTONE_STATIC),yes)
+ifeq ($(IS_MINGW),1)
+ARCHIVE = $(BLDIR)/$(LIBNAME).$(AR_EXT)
+else ifeq ($(IS_CYGWIN),1)
+ARCHIVE = $(BLDIR)/$(LIBNAME).$(AR_EXT)
+else
ARCHIVE = $(BLDIR)/lib$(LIBNAME).$(AR_EXT)
endif
+endif
+
PKGCFGF = $(BLDIR)/$(LIBNAME).pc
.PHONY: all clean install uninstall dist
@@ -291,13 +305,13 @@
cd tests && $(MAKE) BUILDDIR=$(BLDIR)
endif
ifeq ($(CAPSTONE_SHARED),yes)
- $(INSTALL_DATA) $(BLDIR)/lib$(LIBNAME).$(EXT) $(BLDIR)/tests/
+ $(INSTALL_DATA) $(LIBRARY) $(BLDIR)/tests/
endif
ifeq ($(CAPSTONE_SHARED),yes)
$(LIBRARY): $(LIBOBJ)
ifeq ($(V),0)
- $(call log,CCLD,$(@:$(BLDIR)/%=%))
+ $(call log,LINK,$(@:$(BLDIR)/%=%))
@$(create-library)
else
$(create-library)
@@ -339,7 +353,7 @@
ifeq ($(CAPSTONE_SHARED),yes)
# remove potential broken old libs
rm -f $(LIBDIR)/lib$(LIBNAME).*
- $(INSTALL_LIB) $(BLDIR)/lib$(LIBNAME).$(EXT) $(LIBDIR)
+ $(INSTALL_LIB) $(LIBRARY) $(LIBDIR)
ifneq ($(VERSION_EXT),)
cd $(LIBDIR) && \
mv lib$(LIBNAME).$(EXT) lib$(LIBNAME).$(VERSION_EXT) && \
@@ -347,7 +361,7 @@
endif
endif
ifeq ($(CAPSTONE_STATIC),yes)
- $(INSTALL_DATA) $(BLDIR)/lib$(LIBNAME).$(AR_EXT) $(LIBDIR)
+ $(INSTALL_DATA) $(ARCHIVE) $(LIBDIR)
endif
mkdir -p $(INCDIR)/$(LIBNAME)
$(INSTALL_DATA) include/*.h $(INCDIR)/$(LIBNAME)
@@ -361,7 +375,7 @@
clean:
rm -f $(LIBOBJ)
- rm -f $(BLDIR)/lib$(LIBNAME).*
+ rm -f $(BLDIR)/lib$(LIBNAME).* $(BLDIR)/$(LIBNAME).*
rm -f $(PKGCFGF)
cd tests && $(MAKE) clean
rm -f $(BLDIR)/tests/lib$(LIBNAME).$(EXT)
diff --git a/bindings/python/capstone/__init__.py b/bindings/python/capstone/__init__.py
index 41c7dc6..7b82a14 100644
--- a/bindings/python/capstone/__init__.py
+++ b/bindings/python/capstone/__init__.py
@@ -148,7 +148,7 @@
__file__ = inspect.getfile(inspect.currentframe())
_lib_path = split(__file__)[0]
-_all_libs = ['libcapstone.dll', 'libcapstone.so', 'libcapstone.dylib']
+_all_libs = ['capstone.dll', 'libcapstone.so.3', 'libcapstone.so', 'libcapstone.dylib']
_found = False
for _lib in _all_libs:
diff --git a/cs.c b/cs.c
index 21ca39d..08cf8e3 100644
--- a/cs.c
+++ b/cs.c
@@ -87,6 +87,7 @@
cs_vsnprintf_t cs_vsnprintf = NULL;
#endif
+CAPSTONE_EXPORT
unsigned int cs_version(int *major, int *minor)
{
archs_enable();
@@ -99,6 +100,7 @@
return (CS_API_MAJOR << 8) + CS_API_MINOR;
}
+CAPSTONE_EXPORT
bool cs_support(int query)
{
archs_enable();
@@ -132,6 +134,7 @@
return false;
}
+CAPSTONE_EXPORT
cs_err cs_errno(csh handle)
{
struct cs_struct *ud;
@@ -143,6 +146,7 @@
return ud->errnum;
}
+CAPSTONE_EXPORT
const char *cs_strerror(cs_err code)
{
switch(code) {
@@ -175,6 +179,7 @@
}
}
+CAPSTONE_EXPORT
cs_err cs_open(cs_arch arch, cs_mode mode, csh *handle)
{
cs_err err;
@@ -219,6 +224,7 @@
}
}
+CAPSTONE_EXPORT
cs_err cs_close(csh *handle)
{
struct cs_struct *ud;
@@ -345,6 +351,7 @@
}
}
+CAPSTONE_EXPORT
cs_err cs_option(csh ud, cs_opt_type type, size_t value)
{
struct cs_struct *handle;
@@ -415,6 +422,7 @@
// dynamicly allocate memory to contain disasm insn
// NOTE: caller must free() the allocated memory itself to avoid memory leaking
+CAPSTONE_EXPORT
size_t cs_disasm_ex(csh ud, const uint8_t *buffer, size_t size, uint64_t offset, size_t count, cs_insn **insn)
{
struct cs_struct *handle = (struct cs_struct *)(uintptr_t)ud;
@@ -569,6 +577,7 @@
return c;
}
+CAPSTONE_EXPORT
void cs_free(cs_insn *insn, size_t count)
{
size_t i;
@@ -582,6 +591,7 @@
}
// return friendly name of regiser in a string
+CAPSTONE_EXPORT
const char *cs_reg_name(csh ud, unsigned int reg)
{
struct cs_struct *handle = (struct cs_struct *)(uintptr_t)ud;
@@ -593,6 +603,7 @@
return handle->reg_name(ud, reg);
}
+CAPSTONE_EXPORT
const char *cs_insn_name(csh ud, unsigned int insn)
{
struct cs_struct *handle = (struct cs_struct *)(uintptr_t)ud;
@@ -616,6 +627,7 @@
return false;
}
+CAPSTONE_EXPORT
bool cs_insn_group(csh ud, cs_insn *insn, unsigned int group_id)
{
struct cs_struct *handle;
@@ -642,6 +654,7 @@
return arr_exist(insn->detail->groups, insn->detail->groups_count, group_id);
}
+CAPSTONE_EXPORT
bool cs_reg_read(csh ud, cs_insn *insn, unsigned int reg_id)
{
struct cs_struct *handle;
@@ -668,6 +681,7 @@
return arr_exist(insn->detail->regs_read, insn->detail->regs_read_count, reg_id);
}
+CAPSTONE_EXPORT
bool cs_reg_write(csh ud, cs_insn *insn, unsigned int reg_id)
{
struct cs_struct *handle;
@@ -694,6 +708,7 @@
return arr_exist(insn->detail->regs_write, insn->detail->regs_write_count, reg_id);
}
+CAPSTONE_EXPORT
int cs_op_count(csh ud, cs_insn *insn, unsigned int op_type)
{
struct cs_struct *handle;
@@ -769,6 +784,7 @@
return count;
}
+CAPSTONE_EXPORT
int cs_op_index(csh ud, cs_insn *insn, unsigned int op_type,
unsigned int post)
{
diff --git a/include/capstone.h b/include/capstone.h
index 33288c2..4f8b57e 100644
--- a/include/capstone.h
+++ b/include/capstone.h
@@ -16,8 +16,15 @@
#include "platform.h"
#ifdef _MSC_VER
-#pragma warning(disable:4201)
-#pragma warning(disable:4100)
+ #pragma warning(disable:4201)
+ #pragma warning(disable:4100)
+ #ifdef CAPSTONE_SHARED
+ #define CAPSTONE_EXPORT __declspec(dllexport)
+ #else // defined(CAPSTONE_STATIC)
+ #define CAPSTONE_EXPORT
+ #endif
+#else
+ #define CAPSTONE_EXPORT
#endif
// Capstone API version
@@ -254,6 +261,7 @@
NOTE: if you only care about returned value, but not major and minor values,
set both @major & @minor arguments to NULL.
*/
+CAPSTONE_EXPORT
unsigned int cs_version(int *major, int *minor);
@@ -270,6 +278,7 @@
@return True if this library supports the given arch, or in 'diet' mode.
*/
+CAPSTONE_EXPORT
bool cs_support(int query);
/*
@@ -282,6 +291,7 @@
@return CS_ERR_OK on success, or other value on failure (refer to cs_err enum
for detailed error).
*/
+CAPSTONE_EXPORT
cs_err cs_open(cs_arch arch, cs_mode mode, csh *handle);
/*
@@ -298,6 +308,7 @@
@return CS_ERR_OK on success, or other value on failure (refer to cs_err enum
for detailed error).
*/
+CAPSTONE_EXPORT
cs_err cs_close(csh *handle);
/*
@@ -314,6 +325,7 @@
so that cs_option(handle, CS_OPT_MEM, value) can (i.e must) be called
even before cs_open()
*/
+CAPSTONE_EXPORT
cs_err cs_option(csh handle, cs_opt_type type, size_t value);
/*
@@ -324,6 +336,7 @@
@return: error code of cs_err enum type (CS_ERR_*, see above)
*/
+CAPSTONE_EXPORT
cs_err cs_errno(csh handle);
@@ -335,6 +348,7 @@
@return: returns a pointer to a string that describes the error code
passed in the argument @code
*/
+CAPSTONE_EXPORT
const char *cs_strerror(cs_err code);
/*
@@ -358,6 +372,7 @@
On failure, call cs_errno() for error code.
*/
+CAPSTONE_EXPORT
size_t cs_disasm_ex(csh handle,
const uint8_t *code, size_t code_size,
uint64_t address,
@@ -370,6 +385,7 @@
@insn: pointer returned by @insn argument in cs_disasm_ex()
@count: number of cs_insn structures returned by cs_disasm_ex()
*/
+CAPSTONE_EXPORT
void cs_free(cs_insn *insn, size_t count);
/*
@@ -384,6 +400,7 @@
@reg: register id
@return: string name of the register, or NULL if @reg_id is invalid.
*/
+CAPSTONE_EXPORT
const char *cs_reg_name(csh handle, unsigned int reg_id);
/*
@@ -398,6 +415,7 @@
@return: string name of the instruction, or NULL if @insn_id is invalid.
*/
+CAPSTONE_EXPORT
const char *cs_insn_name(csh handle, unsigned int insn_id);
/*
@@ -416,6 +434,7 @@
@return: true if this instruction indeed belongs to aboved group, or false otherwise.
*/
+CAPSTONE_EXPORT
bool cs_insn_group(csh handle, cs_insn *insn, unsigned int group_id);
/*
@@ -433,6 +452,7 @@
@return: true if this instruction indeed implicitly used aboved register, or false otherwise.
*/
+CAPSTONE_EXPORT
bool cs_reg_read(csh handle, cs_insn *insn, unsigned int reg_id);
/*
@@ -450,6 +470,7 @@
@return: true if this instruction indeed implicitly modified aboved register, or false otherwise.
*/
+CAPSTONE_EXPORT
bool cs_reg_write(csh handle, cs_insn *insn, unsigned int reg_id);
/*
@@ -465,6 +486,7 @@
@return: number of operands of given type @op_type in instruction @insn,
or -1 on failure.
*/
+CAPSTONE_EXPORT
int cs_op_count(csh handle, cs_insn *insn, unsigned int op_type);
/*
@@ -483,6 +505,7 @@
@return: index of operand of given type @op_type in <arch>.operands[] array
in instruction @insn, or -1 on failure.
*/
+CAPSTONE_EXPORT
int cs_op_index(csh handle, cs_insn *insn, unsigned int op_type,
unsigned int position);
diff --git a/msvc/capstone_dll/capstone_dll.vcxproj b/msvc/capstone_dll/capstone_dll.vcxproj
index 43020a6..8b5f9bc 100644
--- a/msvc/capstone_dll/capstone_dll.vcxproj
+++ b/msvc/capstone_dll/capstone_dll.vcxproj
@@ -64,19 +64,19 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
- <TargetName>libcapstone</TargetName>
+ <TargetName>capstone</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
- <TargetName>libcapstone</TargetName>
+ <TargetName>capstone</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
- <TargetName>libcapstone</TargetName>
+ <TargetName>capstone</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
- <TargetName>libcapstone</TargetName>
+ <TargetName>capstone</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -84,7 +84,7 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>CAPSTONE_DIET_NO;CAPSTONE_X86_REDUCE_NO;CAPSTONE_HAS_ARM;CAPSTONE_HAS_ARM64;CAPSTONE_HAS_MIPS;CAPSTONE_HAS_POWERPC;CAPSTONE_HAS_SPARC;CAPSTONE_HAS_SYSZ;CAPSTONE_HAS_X86;CAPSTONE_HAS_XCORE;CAPSTONE_USE_SYS_DYN_MEM;WIN32;_DEBUG;_WINDOWS;_USRDLL;CAPSTONEDLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>CAPSTONE_DIET_NO;CAPSTONE_X86_REDUCE_NO;CAPSTONE_HAS_ARM;CAPSTONE_HAS_ARM64;CAPSTONE_HAS_MIPS;CAPSTONE_HAS_POWERPC;CAPSTONE_HAS_SPARC;CAPSTONE_HAS_SYSZ;CAPSTONE_HAS_X86;CAPSTONE_HAS_XCORE;CAPSTONE_USE_SYS_DYN_MEM;WIN32;_DEBUG;_WINDOWS;_USRDLL;CAPSTONE_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\include;..\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
@@ -100,7 +100,7 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>CAPSTONE_DIET_NO;CAPSTONE_X86_REDUCE_NO;CAPSTONE_HAS_ARM;CAPSTONE_HAS_ARM64;CAPSTONE_HAS_MIPS;CAPSTONE_HAS_POWERPC;CAPSTONE_HAS_SPARC;CAPSTONE_HAS_SYSZ;CAPSTONE_HAS_X86;CAPSTONE_HAS_XCORE;CAPSTONE_USE_SYS_DYN_MEM;WIN32;_DEBUG;_WINDOWS;_USRDLL;CAPSTONEDLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>CAPSTONE_DIET_NO;CAPSTONE_X86_REDUCE_NO;CAPSTONE_HAS_ARM;CAPSTONE_HAS_ARM64;CAPSTONE_HAS_MIPS;CAPSTONE_HAS_POWERPC;CAPSTONE_HAS_SPARC;CAPSTONE_HAS_SYSZ;CAPSTONE_HAS_X86;CAPSTONE_HAS_XCORE;CAPSTONE_USE_SYS_DYN_MEM;WIN32;_DEBUG;_WINDOWS;_USRDLL;CAPSTONE_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\include;..\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
@@ -118,7 +118,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>CAPSTONE_DIET_NO;CAPSTONE_X86_REDUCE_NO;CAPSTONE_HAS_ARM;CAPSTONE_HAS_ARM64;CAPSTONE_HAS_MIPS;CAPSTONE_HAS_POWERPC;CAPSTONE_HAS_SPARC;CAPSTONE_HAS_SYSZ;CAPSTONE_HAS_X86;CAPSTONE_HAS_XCORE;CAPSTONE_USE_SYS_DYN_MEM;WIN32;NDEBUG;_WINDOWS;_USRDLL;CAPSTONEDLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>CAPSTONE_DIET_NO;CAPSTONE_X86_REDUCE_NO;CAPSTONE_HAS_ARM;CAPSTONE_HAS_ARM64;CAPSTONE_HAS_MIPS;CAPSTONE_HAS_POWERPC;CAPSTONE_HAS_SPARC;CAPSTONE_HAS_SYSZ;CAPSTONE_HAS_X86;CAPSTONE_HAS_XCORE;CAPSTONE_USE_SYS_DYN_MEM;WIN32;NDEBUG;_WINDOWS;_USRDLL;CAPSTONE_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\include;..\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
@@ -138,7 +138,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>CAPSTONE_DIET_NO;CAPSTONE_X86_REDUCE_NO;CAPSTONE_HAS_ARM;CAPSTONE_HAS_ARM64;CAPSTONE_HAS_MIPS;CAPSTONE_HAS_POWERPC;CAPSTONE_HAS_SPARC;CAPSTONE_HAS_SYSZ;CAPSTONE_HAS_X86;CAPSTONE_HAS_XCORE;CAPSTONE_USE_SYS_DYN_MEM;WIN32;NDEBUG;_WINDOWS;_USRDLL;CAPSTONEDLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>CAPSTONE_DIET_NO;CAPSTONE_X86_REDUCE_NO;CAPSTONE_HAS_ARM;CAPSTONE_HAS_ARM64;CAPSTONE_HAS_MIPS;CAPSTONE_HAS_POWERPC;CAPSTONE_HAS_SPARC;CAPSTONE_HAS_SYSZ;CAPSTONE_HAS_X86;CAPSTONE_HAS_XCORE;CAPSTONE_USE_SYS_DYN_MEM;WIN32;NDEBUG;_WINDOWS;_USRDLL;CAPSTONE_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\include;..\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
diff --git a/msvc/capstone_static/capstone_static.vcxproj b/msvc/capstone_static/capstone_static.vcxproj
index acfc22e..b280902 100644
--- a/msvc/capstone_static/capstone_static.vcxproj
+++ b/msvc/capstone_static/capstone_static.vcxproj
@@ -108,16 +108,16 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <TargetName>libcapstone</TargetName>
+ <TargetName>capstone</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <TargetName>libcapstone</TargetName>
+ <TargetName>capstone</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <TargetName>libcapstone</TargetName>
+ <TargetName>capstone</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <TargetName>libcapstone</TargetName>
+ <TargetName>capstone</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
diff --git a/msvc/test/test.vcxproj b/msvc/test/test.vcxproj
index a83e095..d31969d 100644
--- a/msvc/test/test.vcxproj
+++ b/msvc/test/test.vcxproj
@@ -89,7 +89,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -106,7 +106,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -127,7 +127,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -148,7 +148,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/msvc/test_arm/test_arm.vcxproj b/msvc/test_arm/test_arm.vcxproj
index 4ccafaa..ca032e6 100644
--- a/msvc/test_arm/test_arm.vcxproj
+++ b/msvc/test_arm/test_arm.vcxproj
@@ -89,7 +89,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -106,7 +106,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -127,7 +127,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -148,7 +148,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/msvc/test_arm64/test_arm64.vcxproj b/msvc/test_arm64/test_arm64.vcxproj
index d25b6d5..4a36d35 100644
--- a/msvc/test_arm64/test_arm64.vcxproj
+++ b/msvc/test_arm64/test_arm64.vcxproj
@@ -89,7 +89,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -106,7 +106,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -127,7 +127,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -148,7 +148,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/msvc/test_detail/test_detail.vcxproj b/msvc/test_detail/test_detail.vcxproj
index 383f314..4dc4c52 100644
--- a/msvc/test_detail/test_detail.vcxproj
+++ b/msvc/test_detail/test_detail.vcxproj
@@ -89,7 +89,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -106,7 +106,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -127,7 +127,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -148,7 +148,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/msvc/test_mips/test_mips.vcxproj b/msvc/test_mips/test_mips.vcxproj
index b2cd4a6..1cf6841 100644
--- a/msvc/test_mips/test_mips.vcxproj
+++ b/msvc/test_mips/test_mips.vcxproj
@@ -89,7 +89,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -106,7 +106,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -127,7 +127,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -148,7 +148,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/msvc/test_ppc/test_ppc.vcxproj b/msvc/test_ppc/test_ppc.vcxproj
index 4038f89..fadad83 100644
--- a/msvc/test_ppc/test_ppc.vcxproj
+++ b/msvc/test_ppc/test_ppc.vcxproj
@@ -92,7 +92,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -109,7 +109,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -130,7 +130,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -151,7 +151,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/msvc/test_skipdata/test_skipdata.vcxproj b/msvc/test_skipdata/test_skipdata.vcxproj
index e86fe68..07ab478 100644
--- a/msvc/test_skipdata/test_skipdata.vcxproj
+++ b/msvc/test_skipdata/test_skipdata.vcxproj
@@ -89,7 +89,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -106,7 +106,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -127,7 +127,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -148,7 +148,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/msvc/test_sparc/test_sparc.vcxproj b/msvc/test_sparc/test_sparc.vcxproj
index 387411b..eb7cc7e 100644
--- a/msvc/test_sparc/test_sparc.vcxproj
+++ b/msvc/test_sparc/test_sparc.vcxproj
@@ -89,7 +89,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -106,7 +106,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -127,7 +127,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -148,7 +148,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/msvc/test_systemz/test_systemz.vcxproj b/msvc/test_systemz/test_systemz.vcxproj
index 0f66a40..e884842 100644
--- a/msvc/test_systemz/test_systemz.vcxproj
+++ b/msvc/test_systemz/test_systemz.vcxproj
@@ -92,7 +92,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -109,7 +109,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -130,7 +130,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -151,7 +151,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/msvc/test_x86/test_x86.vcxproj b/msvc/test_x86/test_x86.vcxproj
index ad5b24d..315c663 100644
--- a/msvc/test_x86/test_x86.vcxproj
+++ b/msvc/test_x86/test_x86.vcxproj
@@ -89,7 +89,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -106,7 +106,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -127,7 +127,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -148,7 +148,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/msvc/test_xcore/test_xcore.vcxproj b/msvc/test_xcore/test_xcore.vcxproj
index ee928d3..1e8f19b 100644
--- a/msvc/test_xcore/test_xcore.vcxproj
+++ b/msvc/test_xcore/test_xcore.vcxproj
@@ -89,7 +89,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -106,7 +106,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -127,7 +127,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -148,7 +148,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcapstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/tests/Makefile b/tests/Makefile
index 53c4cca..4080162 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -49,6 +49,16 @@
endif
endif
+ifeq ($(CAPSTONE_STATIC),yes)
+ifeq ($(IS_MINGW),1)
+ARCHIVE = $(LIBDIR)/$(LIBNAME).$(AR_EXT)
+else ifeq ($(IS_CYGWIN),1)
+ARCHIVE = $(LIBDIR)/$(LIBNAME).$(AR_EXT)
+else
+ARCHIVE = $(LIBDIR)/lib$(LIBNAME).$(AR_EXT)
+endif
+endif
+
.PHONY: all clean
SOURCES = test.c test_detail.c test_skipdata.c
@@ -83,7 +93,7 @@
all: $(BINARY)
clean:
- rm -rf $(OBJS) $(BINARY) $(TESTDIR)/*.exe $(TESTDIR)/*.static $(OBJDIR)/lib$(LIBNAME).*
+ rm -rf $(OBJS) $(BINARY) $(TESTDIR)/*.exe $(TESTDIR)/*.static $(OBJDIR)/lib$(LIBNAME).* $(OBJDIR)/$(LIBNAME).*
$(BINARY): $(OBJS)
@@ -91,11 +101,11 @@
@mkdir -p $(@D)
ifeq ($(V),0)
ifeq ($(CAPSTONE_SHARED),yes)
- $(call log,CCLD,$(notdir $@))
+ $(call log,LINK,$(notdir $@))
@$(link-dynamic)
endif
ifeq ($(CAPSTONE_STATIC),yes)
- $(call log,CCLD,$(notdir $(call staticname,$@)))
+ $(call log,LINK,$(notdir $(call staticname,$@)))
@$(link-static)
endif
else
@@ -123,7 +133,7 @@
define link-static
- ${CC} $(CFLAGS) $(LDFLAGS) $< -O3 -Wall $(LIBDIR)/lib$(LIBNAME).$(AR_EXT) -o $(call staticname,$@)
+ ${CC} $(CFLAGS) $(LDFLAGS) $< -O3 -Wall $(ARCHIVE) -o $(call staticname,$@)
endef