Kaydet (Commit) 33b838a4 authored tarafından Peter Foley's avatar Peter Foley

stdcall and declspec(dllexport) don't play nicely together

Change-Id: I56da76771790cb6824ac3d01072d9143cb580741
üst bbe6f3f5
...@@ -13,6 +13,10 @@ $(eval $(call gb_Library_add_defs,sellangmsi,\ ...@@ -13,6 +13,10 @@ $(eval $(call gb_Library_add_defs,sellangmsi,\
-D_STLP_USE_STATIC_LIB \ -D_STLP_USE_STATIC_LIB \
)) ))
$(eval $(call gb_Library_add_ldflags,sellangmsi,\
/DEF:$(SRCDIR)/setup_native/source/win32/customactions/sellang/sellang.def \
))
$(eval $(call gb_Library_add_exception_objects,sellangmsi,\ $(eval $(call gb_Library_add_exception_objects,sellangmsi,\
setup_native/source/win32/customactions/sellang/sellang \ setup_native/source/win32/customactions/sellang/sellang \
setup_native/source/win32/customactions/sellang/sorttree \ setup_native/source/win32/customactions/sellang/sorttree \
......
...@@ -232,7 +232,7 @@ void addMatchingDictionaries( ...@@ -232,7 +232,7 @@ void addMatchingDictionaries(
} }
extern "C" __declspec(dllexport) UINT __stdcall SelectLanguage( MSIHANDLE handle ) extern "C" UINT __stdcall SelectLanguage( MSIHANDLE handle )
{ {
char feature[100]; char feature[100];
MSIHANDLE database, view, record; MSIHANDLE database, view, record;
......
LIBRARY "sellangmsi.dll"
EXPORTS
SelectLanguage
SortTree
\ No newline at end of file
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#pragma warning(pop) #pragma warning(pop)
#endif #endif
extern "C" __declspec(dllexport) UINT __stdcall SortTree(MSIHANDLE) extern "C" UINT __stdcall SortTree(MSIHANDLE)
{ {
// Sort items (languages) in SelectionTree control, fdo#46355 // Sort items (languages) in SelectionTree control, fdo#46355
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment