From: John L. <jr...@us...> - 2007-07-31 20:51:24
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8879/wxLua/modules/wxbind/include Modified Files: wxbinddefs.h Log Message: Add back the old #ifdef checks #if defined(WXMAKINGDLL_BINDWXADV) || defined(WXMAKINGDLL_WXBINDADV) We should use WXMAKINGDLL_BINDWXADV, but this will work for now Index: wxbinddefs.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbinddefs.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxbinddefs.h 17 Jul 2007 23:09:17 -0000 1.6 --- wxbinddefs.h 31 Jul 2007 20:51:21 -0000 1.7 *************** *** 18,22 **** // ---------------------------------------------------------------------------- ! #ifdef WXMAKINGDLL_BINDWXADV #define WXDLLIMPEXP_BINDWXADV WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXADV(type) WXEXPORT type --- 18,22 ---- // ---------------------------------------------------------------------------- ! #if defined(WXMAKINGDLL_BINDWXADV) || defined(WXMAKINGDLL_WXBINDADV) #define WXDLLIMPEXP_BINDWXADV WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXADV(type) WXEXPORT type *************** *** 29,33 **** #endif ! #ifdef WXMAKINGDLL_BINDWXAUI #define WXDLLIMPEXP_BINDWXAUI WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXAUI(type) WXEXPORT type --- 29,33 ---- #endif ! #if defined(WXMAKINGDLL_BINDWXAUI) || defined(WXMAKINGDLL_WXBINDAUI) #define WXDLLIMPEXP_BINDWXAUI WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXAUI(type) WXEXPORT type *************** *** 40,44 **** #endif ! #ifdef WXMAKINGDLL_BINDWXBASE #define WXDLLIMPEXP_BINDWXBASE WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXBASE(type) WXEXPORT type --- 40,44 ---- #endif ! #if defined(WXMAKINGDLL_BINDWXBASE) || defined(WXMAKINGDLL_WXBINDBASE) #define WXDLLIMPEXP_BINDWXBASE WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXBASE(type) WXEXPORT type *************** *** 51,55 **** #endif ! #ifdef WXMAKINGDLL_BINDWXCORE #define WXDLLIMPEXP_BINDWXCORE WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXCORE(type) WXEXPORT type --- 51,55 ---- #endif ! #if defined(WXMAKINGDLL_BINDWXCORE) || defined(WXMAKINGDLL_WXBINDCORE) #define WXDLLIMPEXP_BINDWXCORE WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXCORE(type) WXEXPORT type *************** *** 62,66 **** #endif ! #ifdef WXMAKINGDLL_BINDWXGL #define WXDLLIMPEXP_BINDWXGL WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXGL(type) WXEXPORT type --- 62,66 ---- #endif ! #if defined(WXMAKINGDLL_BINDWXGL) || defined(WXMAKINGDLL_WXBINDGL) #define WXDLLIMPEXP_BINDWXGL WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXGL(type) WXEXPORT type *************** *** 73,77 **** #endif ! #ifdef WXMAKINGDLL_BINDWXHTML #define WXDLLIMPEXP_BINDWXHTML WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXHTML(type) WXEXPORT type --- 73,77 ---- #endif ! #if defined(WXMAKINGDLL_BINDWXHTML) || defined(WXMAKINGDLL_WXBINDHTML) #define WXDLLIMPEXP_BINDWXHTML WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXHTML(type) WXEXPORT type *************** *** 84,88 **** #endif ! #ifdef WXMAKINGDLL_BINDWXMEDIA #define WXDLLIMPEXP_BINDWXMEDIA WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXMEDIA(type) WXEXPORT type --- 84,88 ---- #endif ! #if defined(WXMAKINGDLL_BINDWXMEDIA) || defined(WXMAKINGDLL_WXBINDMEDIA) #define WXDLLIMPEXP_BINDWXMEDIA WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXMEDIA(type) WXEXPORT type *************** *** 95,99 **** #endif ! #ifdef WXMAKINGDLL_BINDWXNET #define WXDLLIMPEXP_BINDWXNET WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXNET(type) WXEXPORT type --- 95,99 ---- #endif ! #if defined(WXMAKINGDLL_BINDWXNET) || defined(WXMAKINGDLL_WXBINDNET) #define WXDLLIMPEXP_BINDWXNET WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXNET(type) WXEXPORT type *************** *** 106,110 **** #endif ! #ifdef WXMAKINGDLL_BINDWXRICHTEXT #define WXDLLIMPEXP_BINDWXRICHTEXT WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXRICHTEXT(type) WXEXPORT type --- 106,110 ---- #endif ! #if defined(WXMAKINGDLL_BINDWXRICHTEXT) || defined(WXMAKINGDLL_WXBINDRICHTEXT) #define WXDLLIMPEXP_BINDWXRICHTEXT WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXRICHTEXT(type) WXEXPORT type *************** *** 117,121 **** #endif ! #ifdef WXMAKINGDLL_BINDWXSTC #define WXDLLIMPEXP_BINDWXSTC WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXSTC(type) WXEXPORT type --- 117,121 ---- #endif ! #if defined(WXMAKINGDLL_BINDWXSTC) || defined(WXMAKINGDLL_WXBINDSTC) #define WXDLLIMPEXP_BINDWXSTC WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXSTC(type) WXEXPORT type *************** *** 128,132 **** #endif ! #ifdef WXMAKINGDLL_BINDWXXML #define WXDLLIMPEXP_BINDWXXML WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXXML(type) WXEXPORT type --- 128,132 ---- #endif ! #if defined(WXMAKINGDLL_BINDWXXML) || defined(WXMAKINGDLL_WXBINDXML) #define WXDLLIMPEXP_BINDWXXML WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXXML(type) WXEXPORT type *************** *** 139,143 **** #endif ! #ifdef WXMAKINGDLL_BINDWXXRC #define WXDLLIMPEXP_BINDWXXRC WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXXRC(type) WXEXPORT type --- 139,143 ---- #endif ! #if defined(WXMAKINGDLL_BINDWXXRC) || defined(WXMAKINGDLL_WXBINDXRC) #define WXDLLIMPEXP_BINDWXXRC WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXXRC(type) WXEXPORT type |