wxlua-commit

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/modules
In directory vz-cvs-4.sog:/tmp/cvs-serv7666/modules

Modified Files:
	CMakeLists.txt 
Log Message:
Fix build for DLLs


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/CMakeLists.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CMakeLists.txt	31 Oct 2011 03:56:01 -0000	1.3
--- CMakeLists.txt	2 Nov 2011 04:18:10 -0000	1.4
***************
*** 44,47 ****
--- 44,63 ----
  # ---------------------------------------------------------------------------
  
+ 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"
+     PROPERTIES FOLDER "wxLua/Modules")
+ 
+ # ---------------------------------------------------------------------------
+ 
  ADD_LIBRARY_FULL( wxLuaSocketLib
      HEADERS
***************
*** 60,64 ****
          wxLuaBind_core_Lib
          wxLuaDebugLib
-         wxLuaLib
      PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXLUASOCKET"
      PROPERTIES FOLDER "wxLua/Modules")
--- 76,79 ----
***************
*** 66,85 ****
  # ---------------------------------------------------------------------------
  
- 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"
-     PROPERTIES FOLDER "wxLua/Modules")
- 
- # ---------------------------------------------------------------------------
- 
  if (WX_adv OR WX_advd OR WX_mono OR WX_monod)
  
--- 81,84 ----
***************
*** 312,317 ****
          ${wxLua_ROOT_DIR}/modules/wxbind/include/*.h
      SOURCES
!         #${wxLua_ROOT_DIR}/modules/wxbind/src/*.cpp
!         ${wxLuaBindLib_SOURCES}
          #${wxLuaBindLib_OBJECTS}
      LINK_LIBRARIES
--- 311,316 ----
          ${wxLua_ROOT_DIR}/modules/wxbind/include/*.h
      SOURCES
!         ${wxLua_ROOT_DIR}/modules/wxbind/src/*.cpp
!         #${wxLuaBindLib_SOURCES}
          #${wxLuaBindLib_OBJECTS}
      LINK_LIBRARIES
***************
*** 322,339 ****
  
  
! 
! add_dependencies(wxLuaBindLib
!     wxLuaBind_adv_Lib
!     wxLuaBind_aui_Lib
!     wxLuaBind_base_Lib
!     wxLuaBind_core_Lib
!     wxLuaBind_gl_Lib
!     wxLuaBind_html_Lib
!     wxLuaBind_media_Lib
!     wxLuaBind_net_Lib
!     wxLuaBind_richtext_Lib
!     wxLuaBind_stc_Lib
!     wxLuaBind_xml_Lib
!     wxLuaBind_xrc_Lib)
  
  # ---------------------------------------------------------------------------
--- 321,337 ----
  
  
! #add_dependencies(wxLuaBindLib
! #    wxLuaBind_adv_Lib
! #    wxLuaBind_aui_Lib
! #    wxLuaBind_base_Lib
! #    wxLuaBind_core_Lib
! #    wxLuaBind_gl_Lib
! #    wxLuaBind_html_Lib
! #    wxLuaBind_media_Lib
! #    wxLuaBind_net_Lib
! #    wxLuaBind_richtext_Lib
! #    wxLuaBind_stc_Lib
! #    wxLuaBind_xml_Lib
! #    wxLuaBind_xrc_Lib)
  
  # ---------------------------------------------------------------------------
***************
*** 353,356 ****
--- 351,355 ----
          #wxLuaDebugLib
          #wxLuaLib
+         LuaLib
          ${wxWidgets_LIBRARIES}
      PROPERTIES DEFINE_SYMBOL       "WXMAKINGDLL_LUAMODULE"