Browse Source

convert c api into __stdcall on windows

Antialize 15 years ago
parent
commit
0a5b46d786
4 changed files with 58 additions and 2 deletions
  1. 8 2
      src/lib/dllbegin.inc
  2. 1 0
      src/lib/dllend.inc
  3. 48 0
      src/lib/lib.def
  4. 1 0
      src/lib/lib.pro

+ 8 - 2
src/lib/dllbegin.inc

@@ -39,10 +39,16 @@
   #endif
 #endif
 
+#if defined _WIN32
+#define CALLTYPE __stdcall
+#else
+#define CALLTYPE
+#endif
+
 #ifdef __cplusplus
-  #define CAPI extern "C" DLL_PUBLIC
+  #define CAPI extern "C" DLL_PUBLIC CALLTYPE
 #else
-  #define CAPI DLL_PUBLIC
+  #define CAPI DLL_PUBLIC CALLTYPE
 #endif
 
 #endif /*__WKHTMLTOPDF_DLLBEGIN__*/

+ 1 - 0
src/lib/dllend.inc

@@ -25,5 +25,6 @@
 #undef DLL_PUBLIC
 #undef DLL_LOCAL
 #undef CAPI
+#undef CALLTYPE
 
 #endif /*__WKHTMLTOPDF_DLLBEGIN__*/

+ 48 - 0
src/lib/lib.def

@@ -0,0 +1,48 @@
+LIBRARY WKHTMLTOX
+EXPORTS
+wkhtmltopdf_init
+wkhtmltopdf_deinit
+wkhtmltopdf_extended_qt
+wkhtmltopdf_version
+wkhtmltopdf_create_global_settings
+wkhtmltopdf_create_object_settings
+wkhtmltopdf_set_global_setting
+wkhtmltopdf_get_global_setting
+wkhtmltopdf_set_object_setting
+wkhtmltopdf_get_object_setting
+wkhtmltopdf_create_converter
+wkhtmltopdf_destroy_converter
+wkhtmltopdf_set_warning_callback
+wkhtmltopdf_set_error_callback
+wkhtmltopdf_set_phase_changed_callback
+wkhtmltopdf_set_progress_changed_callback
+wkhtmltopdf_set_finished_callback
+wkhtmltopdf_convert
+wkhtmltopdf_add_object
+wkhtmltopdf_current_phase
+wkhtmltopdf_phase_count
+wkhtmltopdf_phase_description
+wkhtmltopdf_progress_string
+wkhtmltopdf_http_error_code
+wkhtmltopdf_get_output
+wkhtmltoimage_init
+wkhtmltoimage_deinit
+wkhtmltoimage_extended_qt
+wkhtmltoimage_version
+wkhtmltoimage_create_global_settings
+wkhtmltoimage_set_global_setting
+wkhtmltoimage_get_global_setting
+wkhtmltoimage_create_converter
+wkhtmltoimage_destroy_converter
+wkhtmltoimage_set_warning_callback
+wkhtmltoimage_set_error_callback
+wkhtmltoimage_set_phase_changed_callback
+wkhtmltoimage_set_progress_changed_callback
+wkhtmltoimage_set_finished_callback
+wkhtmltoimage_convert
+wkhtmltoimage_current_phase
+wkhtmltoimage_phase_count
+wkhtmltoimage_phase_description
+wkhtmltoimage_progress_string
+wkhtmltoimage_http_error_code
+wkhtmltoimage_get_output

+ 1 - 0
src/lib/lib.pro

@@ -22,6 +22,7 @@ include(../../version.pri)
 include(../../common.pri)
 include(lib.pri)
 
+DEF_FILE = lib.def
 DEFINES += __WKHTMLTOX_UNDEF_QT_DLL__
 
 unix {