Menu
▾
▴
wxlua-commit
|
From: John L. <jr...@us...> - 2011-10-31 03:56:03
|
Update of /cvsroot/wxlua/wxLua/modules
In directory vz-cvs-4.sog:/tmp/cvs-serv3836/modules
Modified Files:
CMakeLists.txt
Log Message:
Get the Lua module to build using CMake. Bump version to 2.8.12
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/CMakeLists.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CMakeLists.txt 29 Oct 2011 06:45:18 -0000 1.2
--- CMakeLists.txt 31 Oct 2011 03:56:01 -0000 1.3
***************
*** 15,19 ****
# CMake build file for wxLua Library
# ---------------------------------------------------------------------------
!
include_directories(${wxLua_ROOT_DIR}/
${wxLua_ROOT_DIR}/modules/
--- 15,19 ----
# CMake build file for wxLua Library
# ---------------------------------------------------------------------------
!
include_directories(${wxLua_ROOT_DIR}/
${wxLua_ROOT_DIR}/modules/
***************
*** 21,27 ****
# ---------------------------------------------------------------------------
!
! ADD_LIBRARY_FULL( wxLuaLib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxlua/include/wxlbind.h
${wxLua_ROOT_DIR}/modules/wxlua/include/wxlcallb.h
--- 21,27 ----
# ---------------------------------------------------------------------------
!
! ADD_LIBRARY_FULL( wxLuaLib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxlua/include/wxlbind.h
${wxLua_ROOT_DIR}/modules/wxlua/include/wxlcallb.h
***************
*** 30,34 ****
${wxLua_ROOT_DIR}/modules/wxlua/include/wxlua.h
${wxLua_ROOT_DIR}/modules/wxlua/include/wxlua_bind.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxlua/src/dummy.cpp
${wxLua_ROOT_DIR}/modules/wxlua/src/wxlbind.cpp
--- 30,34 ----
${wxLua_ROOT_DIR}/modules/wxlua/include/wxlua.h
${wxLua_ROOT_DIR}/modules/wxlua/include/wxlua_bind.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxlua/src/dummy.cpp
${wxLua_ROOT_DIR}/modules/wxlua/src/wxlbind.cpp
***************
*** 36,40 ****
${wxLua_ROOT_DIR}/modules/wxlua/src/wxlstate.cpp
${wxLua_ROOT_DIR}/modules/wxlua/src/wxlua_bind.cpp
! LINK_LIBRARIES
LuaLib
${wxWidgets_LIBRARIES}
--- 36,40 ----
${wxLua_ROOT_DIR}/modules/wxlua/src/wxlstate.cpp
${wxLua_ROOT_DIR}/modules/wxlua/src/wxlua_bind.cpp
! LINK_LIBRARIES
LuaLib
${wxWidgets_LIBRARIES}
***************
*** 43,49 ****
# ---------------------------------------------------------------------------
!
! ADD_LIBRARY_FULL( wxLuaSocketLib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxldserv.h
${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxldtarg.h
--- 43,49 ----
# ---------------------------------------------------------------------------
!
! ADD_LIBRARY_FULL( wxLuaSocketLib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxldserv.h
${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxldtarg.h
***************
*** 51,55 ****
${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxluasocket_bind.h
${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxluasocketdefs.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxluasocket/src/dummy.cpp
${wxLua_ROOT_DIR}/modules/wxluasocket/src/wxldserv.cpp
--- 51,55 ----
${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxluasocket_bind.h
${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxluasocketdefs.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxluasocket/src/dummy.cpp
${wxLua_ROOT_DIR}/modules/wxluasocket/src/wxldserv.cpp
***************
*** 57,61 ****
${wxLua_ROOT_DIR}/modules/wxluasocket/src/wxlsock.cpp
${wxLua_ROOT_DIR}/modules/wxluasocket/src/wxluasocket_bind.cpp
! LINK_LIBRARIES
wxLuaBind_core_Lib
wxLuaDebugLib
--- 57,61 ----
${wxLua_ROOT_DIR}/modules/wxluasocket/src/wxlsock.cpp
${wxLua_ROOT_DIR}/modules/wxluasocket/src/wxluasocket_bind.cpp
! LINK_LIBRARIES
wxLuaBind_core_Lib
wxLuaDebugLib
***************
*** 63,79 ****
PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXLUASOCKET"
PROPERTIES FOLDER "wxLua/Modules")
!
# ---------------------------------------------------------------------------
!
! ADD_LIBRARY_FULL( wxLuaDebugLib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxldebug.h
${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxlstack.h
${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxluadebugdefs.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxluadebug/src/dummy.cpp
${wxLua_ROOT_DIR}/modules/wxluadebug/src/wxldebug.cpp
${wxLua_ROOT_DIR}/modules/wxluadebug/src/wxlstack.cpp
! LINK_LIBRARIES
wxLuaLib
PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXLUADEBUG"
--- 63,79 ----
PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXLUASOCKET"
PROPERTIES FOLDER "wxLua/Modules")
!
# ---------------------------------------------------------------------------
!
! ADD_LIBRARY_FULL( wxLuaDebugLib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxldebug.h
${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxlstack.h
${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxluadebugdefs.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxluadebug/src/dummy.cpp
${wxLua_ROOT_DIR}/modules/wxluadebug/src/wxldebug.cpp
${wxLua_ROOT_DIR}/modules/wxluadebug/src/wxlstack.cpp
! LINK_LIBRARIES
wxLuaLib
PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXLUADEBUG"
***************
*** 84,94 ****
if (WX_adv OR WX_advd OR WX_mono OR WX_monod)
! ADD_LIBRARY_FULL( wxLuaBind_adv_Lib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxbind/include/wxadv_*.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxbind/src/wxadv_*.cpp
${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp
! LINK_LIBRARIES
wxLuaBind_core_Lib
wxLuaLib
--- 84,94 ----
if (WX_adv OR WX_advd OR WX_mono OR WX_monod)
! ADD_LIBRARY_FULL( wxLuaBind_adv_Lib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxbind/include/wxadv_*.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxbind/src/wxadv_*.cpp
${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp
! LINK_LIBRARIES
wxLuaBind_core_Lib
wxLuaLib
***************
*** 100,110 ****
if (WX_aui OR WX_auid OR WX_mono OR WX_monod)
! ADD_LIBRARY_FULL( wxLuaBind_aui_Lib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxbind/include/wxaui_*.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxbind/src/wxaui_*.cpp
${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp
! LINK_LIBRARIES
wxLuaBind_core_Lib
wxLuaLib
--- 100,110 ----
if (WX_aui OR WX_auid OR WX_mono OR WX_monod)
! ADD_LIBRARY_FULL( wxLuaBind_aui_Lib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxbind/include/wxaui_*.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxbind/src/wxaui_*.cpp
${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp
! LINK_LIBRARIES
wxLuaBind_core_Lib
wxLuaLib
***************
*** 116,126 ****
if (WX_base OR WX_based OR WX_mono OR WX_monod)
! ADD_LIBRARY_FULL( wxLuaBind_base_Lib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxbind/include/wxbase_*.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxbind/src/wxbase_*.cpp
${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp
! LINK_LIBRARIES
wxLuaLib
PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_BINDWXBASE"
--- 116,126 ----
if (WX_base OR WX_based OR WX_mono OR WX_monod)
! ADD_LIBRARY_FULL( wxLuaBind_base_Lib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxbind/include/wxbase_*.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxbind/src/wxbase_*.cpp
${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp
! LINK_LIBRARIES
wxLuaLib
PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_BINDWXBASE"
***************
*** 131,141 ****
if (WX_core OR WX_cored OR WX_mono OR WX_monod)
! ADD_LIBRARY_FULL( wxLuaBind_core_Lib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxbind/include/wxcore_*.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxbind/src/wxcore_*.cpp
${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp
! LINK_LIBRARIES
wxLuaBind_base_Lib
wxLuaLib
--- 131,141 ----
if (WX_core OR WX_cored OR WX_mono OR WX_monod)
! ADD_LIBRARY_FULL( wxLuaBind_core_Lib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxbind/include/wxcore_*.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxbind/src/wxcore_*.cpp
${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp
! LINK_LIBRARIES
wxLuaBind_base_Lib
wxLuaLib
***************
*** 147,157 ****
if (WX_gl OR WX_gld OR WX_mono OR WX_monod)
! ADD_LIBRARY_FULL( wxLuaBind_gl_Lib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxbind/include/wxgl_*.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxbind/src/wxgl_*.cpp
${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp
! LINK_LIBRARIES
wxLuaBind_core_Lib
wxLuaLib
--- 147,157 ----
if (WX_gl OR WX_gld OR WX_mono OR WX_monod)
! ADD_LIBRARY_FULL( wxLuaBind_gl_Lib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxbind/include/wxgl_*.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxbind/src/wxgl_*.cpp
${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp
! LINK_LIBRARIES
wxLuaBind_core_Lib
wxLuaLib
***************
*** 163,173 ****
if (WX_html OR WX_htmld OR WX_mono OR WX_monod)
! ADD_LIBRARY_FULL( wxLuaBind_html_Lib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxbind/include/wxhtml_*.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxbind/src/wxhtml_*.cpp
${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp
! LINK_LIBRARIES
wxLuaBind_core_Lib
wxLuaLib
--- 163,173 ----
if (WX_html OR WX_htmld OR WX_mono OR WX_monod)
! ADD_LIBRARY_FULL( wxLuaBind_html_Lib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxbind/include/wxhtml_*.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxbind/src/wxhtml_*.cpp
${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp
! LINK_LIBRARIES
wxLuaBind_core_Lib
wxLuaLib
***************
*** 179,189 ****
if (WX_media OR WX_mediad OR WX_mono OR WX_monod)
! ADD_LIBRARY_FULL( wxLuaBind_media_Lib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxbind/include/wxmedia_*.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxbind/src/wxmedia_*.cpp
${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp
! LINK_LIBRARIES
wxLuaBind_net_Lib
wxLuaBind_core_Lib
--- 179,189 ----
if (WX_media OR WX_mediad OR WX_mono OR WX_monod)
! ADD_LIBRARY_FULL( wxLuaBind_media_Lib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxbind/include/wxmedia_*.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxbind/src/wxmedia_*.cpp
${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp
! LINK_LIBRARIES
wxLuaBind_net_Lib
wxLuaBind_core_Lib
***************
*** 196,206 ****
if (WX_net OR WX_netd OR WX_mono OR WX_monod)
! ADD_LIBRARY_FULL( wxLuaBind_net_Lib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxbind/include/wxnet_*.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxbind/src/wxnet_*.cpp
${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp
! LINK_LIBRARIES
wxLuaBind_core_Lib
wxLuaLib
--- 196,206 ----
if (WX_net OR WX_netd OR WX_mono OR WX_monod)
! ADD_LIBRARY_FULL( wxLuaBind_net_Lib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxbind/include/wxnet_*.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxbind/src/wxnet_*.cpp
${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp
! LINK_LIBRARIES
wxLuaBind_core_Lib
wxLuaLib
***************
*** 212,222 ****
if (WX_richtext OR WX_richtextd OR WX_mono OR WX_monod)
! ADD_LIBRARY_FULL( wxLuaBind_richtext_Lib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxbind/include/wxrichtext_*.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxbind/src/wxrichtext_*.cpp
${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp
! LINK_LIBRARIES
wxLuaBind_core_Lib
wxLuaLib
--- 212,222 ----
if (WX_richtext OR WX_richtextd OR WX_mono OR WX_monod)
! ADD_LIBRARY_FULL( wxLuaBind_richtext_Lib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxbind/include/wxrichtext_*.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxbind/src/wxrichtext_*.cpp
${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp
! LINK_LIBRARIES
wxLuaBind_core_Lib
wxLuaLib
***************
*** 228,238 ****
if (WX_stc OR WX_stcd OR WX_mono OR WX_monod)
! ADD_LIBRARY_FULL( wxLuaBind_stc_Lib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxbind/include/wxstc_*.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxbind/src/wxstc_*.cpp
${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp
! LINK_LIBRARIES
wxLuaBind_core_Lib
wxLuaLib
--- 228,238 ----
if (WX_stc OR WX_stcd OR WX_mono OR WX_monod)
! ADD_LIBRARY_FULL( wxLuaBind_stc_Lib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxbind/include/wxstc_*.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxbind/src/wxstc_*.cpp
${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp
! LINK_LIBRARIES
wxLuaBind_core_Lib
wxLuaLib
***************
*** 244,254 ****
if (WX_xml OR WX_xmld OR WX_mono OR WX_monod)
! ADD_LIBRARY_FULL( wxLuaBind_xml_Lib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxbind/include/wxxml_*.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxbind/src/wxxml_*.cpp
${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp
! LINK_LIBRARIES
wxLuaBind_base_Lib
wxLuaLib
--- 244,254 ----
if (WX_xml OR WX_xmld OR WX_mono OR WX_monod)
! ADD_LIBRARY_FULL( wxLuaBind_xml_Lib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxbind/include/wxxml_*.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxbind/src/wxxml_*.cpp
${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp
! LINK_LIBRARIES
wxLuaBind_base_Lib
wxLuaLib
***************
*** 260,270 ****
if (WX_xrc OR WX_xrcd OR WX_mono OR WX_monod)
! ADD_LIBRARY_FULL( wxLuaBind_xrc_Lib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxbind/include/wxxrc_*.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxbind/src/wxxrc_*.cpp
${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp
! LINK_LIBRARIES
wxLuaBind_core_Lib
wxLuaLib
--- 260,270 ----
if (WX_xrc OR WX_xrcd OR WX_mono OR WX_monod)
! ADD_LIBRARY_FULL( wxLuaBind_xrc_Lib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxbind/include/wxxrc_*.h
! SOURCES
${wxLua_ROOT_DIR}/modules/wxbind/src/wxxrc_*.cpp
${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp
! LINK_LIBRARIES
wxLuaBind_core_Lib
wxLuaLib
***************
*** 276,280 ****
# ---------------------------------------------------------------------------
! set(wxLuaBindLib_SOURCES
${wxLuaBind_adv_Lib_SOURCE_FILES}
${wxLuaBind_aui_Lib_SOURCE_FILES}
--- 276,280 ----
# ---------------------------------------------------------------------------
! set(wxLuaBindLib_SOURCES
${wxLuaBind_adv_Lib_SOURCE_FILES}
${wxLuaBind_aui_Lib_SOURCE_FILES}
***************
*** 289,295 ****
${wxLuaBind_xml_Lib_SOURCE_FILES}
${wxLuaBind_xrc_Lib_SOURCE_FILES})
! list(REMOVE_DUPLICATES wxLuaBindLib_SOURCES)
! set(wxLuaBindLib_OBJECTS
${wxLuaBind_adv_Lib_OBJECT_FILES}
${wxLuaBind_aui_Lib_OBJECT_FILES}
--- 289,295 ----
${wxLuaBind_xml_Lib_SOURCE_FILES}
${wxLuaBind_xrc_Lib_SOURCE_FILES})
! list(REMOVE_DUPLICATES wxLuaBindLib_SOURCES)
! set(wxLuaBindLib_OBJECTS
${wxLuaBind_adv_Lib_OBJECT_FILES}
${wxLuaBind_aui_Lib_OBJECT_FILES}
***************
*** 304,318 ****
${wxLuaBind_xml_Lib_OBJECT_FILES}
${wxLuaBind_xrc_Lib_OBJECT_FILES})
! list(REMOVE_DUPLICATES wxLuaBindLib_OBJECTS)
set_source_files_properties(${wxLuaBindLib_OBJECTS} PROPERTIES GENERATED TRUE)
! ADD_LIBRARY_FULL( wxLuaBindLib
! HEADERS
${wxLua_ROOT_DIR}/modules/wxbind/include/*.h
! SOURCES
#${wxLua_ROOT_DIR}/modules/wxbind/src/*.cpp
${wxLuaBindLib_SOURCES}
#${wxLuaBindLib_OBJECTS}
! LINK_LIBRARIES
wxLuaLib
PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXBIND"
--- 304,319 ----
${wxLuaBind_xml_Lib_OBJECT_FILES}
${wxLuaBind_xrc_Lib_OBJECT_FILES})
! list(REMOVE_DUPLICATES wxLuaBindLib_OBJECTS)
set_source_files_properties(${wxLuaBindLib_OBJECTS} PROPERTIES GENERATED TRUE)
!
! ADD_LIBRARY_FULL( wxLuaBindLib ALLOW_MISSING_FILES
! HEADERS
${wxLua_ROOT_DIR}/modules/wxbind/include/*.h
! SOURCES
#${wxLua_ROOT_DIR}/modules/wxbind/src/*.cpp
${wxLuaBindLib_SOURCES}
#${wxLuaBindLib_OBJECTS}
! LINK_LIBRARIES
wxLuaLib
PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXBIND"
***************
*** 320,323 ****
--- 321,326 ----
PROPERTIES FOLDER "wxLua/Modules")
+
+
add_dependencies(wxLuaBindLib
wxLuaBind_adv_Lib
***************
*** 333,389 ****
wxLuaBind_xml_Lib
wxLuaBind_xrc_Lib)
!
# ---------------------------------------------------------------------------
!
! ADD_LIBRARY_FULL( wxLuaModule
! HEADERS
${wxLua_ROOT_DIR}/modules/luamodule/include/*.h
! SOURCES
${wxLua_ROOT_DIR}/modules/luamodule/src/*.cpp
! LINK_LIBRARIES
! wxLuaBindLib
! wxLuaSocketLib
! wxLuaLib
! PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_LUAMODULE"
PROPERTIES FOLDER "wxLua/Modules")
# ---------------------------------------------------------------------------
!
add_definitions( -D_CRT_SECURE_NO_WARNINGS )
!
ADD_LIBRARY_FULL( LuaLib
! HEADERS
${wxLua_ROOT_DIR}/modules/lua/src/*.h
! SOURCES
! ${wxLua_ROOT_DIR}/modules/lua/src/lapi.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lcode.c
! ${wxLua_ROOT_DIR}/modules/lua/src/ldebug.c
! ${wxLua_ROOT_DIR}/modules/lua/src/ldo.c
! ${wxLua_ROOT_DIR}/modules/lua/src/ldump.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lfunc.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lgc.c
! ${wxLua_ROOT_DIR}/modules/lua/src/llex.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lmem.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lobject.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lopcodes.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lparser.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lstate.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lstring.c
! ${wxLua_ROOT_DIR}/modules/lua/src/ltable.c
! ${wxLua_ROOT_DIR}/modules/lua/src/ltm.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lundump.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lvm.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lzio.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lauxlib.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lbaselib.c
! ${wxLua_ROOT_DIR}/modules/lua/src/ldblib.c
! ${wxLua_ROOT_DIR}/modules/lua/src/liolib.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lmathlib.c
! ${wxLua_ROOT_DIR}/modules/lua/src/loslib.c
! ${wxLua_ROOT_DIR}/modules/lua/src/ltablib.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lstrlib.c
! ${wxLua_ROOT_DIR}/modules/lua/src/loadlib.c
${wxLua_ROOT_DIR}/modules/lua/src/linit.c
! LINK_LIBRARIES
PROPERTIES DEFINE_SYMBOL "LUA_BUILD_AS_DLL"
PROPERTIES FOLDER "wxLua/Modules")
--- 336,402 ----
wxLuaBind_xml_Lib
wxLuaBind_xrc_Lib)
!
# ---------------------------------------------------------------------------
!
! ADD_LIBRARY_FULL( wxLuaModule SHARED ALLOW_MISSING_FILES
! HEADERS
${wxLua_ROOT_DIR}/modules/luamodule/include/*.h
! SOURCES
${wxLua_ROOT_DIR}/modules/luamodule/src/*.cpp
! ${wxLuaBindLib_SOURCE_FILES}
! ${wxLuaSocketLib_SOURCE_FILES}
! ${wxLuaDebugLib_SOURCE_FILES}
! ${wxLuaLib_SOURCE_FILES}
! LINK_LIBRARIES
! #wxLuaBindLib
! #wxLuaSocketLib
! #wxLuaDebugLib
! #wxLuaLib
! ${wxWidgets_LIBRARIES}
! PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_LUAMODULE"
PROPERTIES FOLDER "wxLua/Modules")
+ SET_TARGET_PROPERTIES(wxLuaModule
+ PROPERTIES COMPILE_DEFINITIONS "WXMAKINGDLL_WXLUA;WXMAKINGDLL_WXLUASOCKET;WXMAKINGDLL_WXLUADEBUG;WXMAKINGDLL_WXBIND")
+
+
# ---------------------------------------------------------------------------
!
add_definitions( -D_CRT_SECURE_NO_WARNINGS )
!
ADD_LIBRARY_FULL( LuaLib
! HEADERS
${wxLua_ROOT_DIR}/modules/lua/src/*.h
! SOURCES
! ${wxLua_ROOT_DIR}/modules/lua/src/lapi.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lcode.c
! ${wxLua_ROOT_DIR}/modules/lua/src/ldebug.c
! ${wxLua_ROOT_DIR}/modules/lua/src/ldo.c
! ${wxLua_ROOT_DIR}/modules/lua/src/ldump.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lfunc.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lgc.c
! ${wxLua_ROOT_DIR}/modules/lua/src/llex.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lmem.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lobject.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lopcodes.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lparser.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lstate.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lstring.c
! ${wxLua_ROOT_DIR}/modules/lua/src/ltable.c
! ${wxLua_ROOT_DIR}/modules/lua/src/ltm.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lundump.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lvm.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lzio.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lauxlib.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lbaselib.c
! ${wxLua_ROOT_DIR}/modules/lua/src/ldblib.c
! ${wxLua_ROOT_DIR}/modules/lua/src/liolib.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lmathlib.c
! ${wxLua_ROOT_DIR}/modules/lua/src/loslib.c
! ${wxLua_ROOT_DIR}/modules/lua/src/ltablib.c
! ${wxLua_ROOT_DIR}/modules/lua/src/lstrlib.c
! ${wxLua_ROOT_DIR}/modules/lua/src/loadlib.c
${wxLua_ROOT_DIR}/modules/lua/src/linit.c
! LINK_LIBRARIES
PROPERTIES DEFINE_SYMBOL "LUA_BUILD_AS_DLL"
PROPERTIES FOLDER "wxLua/Modules")
***************
*** 406,416 ****
ADD_EXECUTABLE_FULL( luac ALLOW_MISSING_FILES
HEADERS ""
! SOURCES
! ${wxLua_ROOT_DIR}/modules/lua/src/luac.c
${wxLua_ROOT_DIR}/modules/lua/src/print.c
#${LuaLib_SOURCE_FILES} # alternatively we could simply recompile these
#${LuaLib_OBJECTS} # see note above about DLL linking
${LUAC_SOURCES}
! LINK_LIBRARIES
# LuaLib # see note above about DLL linking
PROPERTIES FOLDER "wxLua/apps")
--- 419,429 ----
ADD_EXECUTABLE_FULL( luac ALLOW_MISSING_FILES
HEADERS ""
! SOURCES
! ${wxLua_ROOT_DIR}/modules/lua/src/luac.c
${wxLua_ROOT_DIR}/modules/lua/src/print.c
#${LuaLib_SOURCE_FILES} # alternatively we could simply recompile these
#${LuaLib_OBJECTS} # see note above about DLL linking
${LUAC_SOURCES}
! LINK_LIBRARIES
# LuaLib # see note above about DLL linking
PROPERTIES FOLDER "wxLua/apps")
***************
*** 420,427 ****
ADD_EXECUTABLE_FULL( lua
! HEADERS
! SOURCES
${wxLua_ROOT_DIR}/modules/lua/src/lua.c
! LINK_LIBRARIES
LuaLib
PROPERTIES FOLDER "wxLua/apps")
--- 433,440 ----
ADD_EXECUTABLE_FULL( lua
! HEADERS
! SOURCES
${wxLua_ROOT_DIR}/modules/lua/src/lua.c
! LINK_LIBRARIES
LuaLib
PROPERTIES FOLDER "wxLua/apps")
|
Thanks for helping keep SourceForge clean.
X