[Wxlua-commit] wxLua/modules/wxluasocket/src Makefile, 1.16, 1.17 wxluasocket_bind.cpp, 1.21, 1.22

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

Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15684/wxLua/modules/wxluasocket/src

Modified Files:
	Makefile wxluasocket_bind.cpp 
Log Message:
Separate wxWidgets bindings into wxadv, wxaui, wxbase, wxcore, etc...

Allow bool = 1/0 and 1/0 = bool in wxlua_getboolean/integer/number



Index: wxluasocket_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket_bind.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** wxluasocket_bind.cpp	14 Jun 2007 01:23:20 -0000	1.21
--- wxluasocket_bind.cpp	16 Jul 2007 19:35:31 -0000	1.22
***************
*** 203,209 ****
  {
      static wxLuaBinding_wxluasocket m_binding;
!     wxLuaBindingList::compatibility_iterator node = wxLuaBinding::GetBindingList()->Find(&m_binding);
!     if (node && (node->GetData() == &m_binding))
!         return false;
  
      wxLuaBinding::GetBindingList()->Append(&m_binding);
--- 203,207 ----
  {
      static wxLuaBinding_wxluasocket m_binding;
!     if (wxLuaBinding::GetBindingList()->Find(&m_binding)) return false;
  
      wxLuaBinding::GetBindingList()->Append(&m_binding);

Index: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Makefile	4 Jul 2007 05:39:22 -0000	1.16
--- Makefile	16 Jul 2007 19:35:31 -0000	1.17
***************
*** 18,28 ****
  # ----------------------------------------------------------------------------
  
! TARGET_LIBNAME = lib$(WXLUASOCKET_LIB)
! TARGET_LIBDIR  = $(WXLUA_LIBDIR)
! 
! TARGET_LIB_STATIC = $(TARGET_LIBDIR)/$(TARGET_LIBNAME).a
! TARGET_LIB_SHARED = $(TARGET_LIBDIR)/$(TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT).$(WXLUA_LIBVERSION_REVISION).$(WXLUA_LIBVERSION_AGE)
! TARGET_LIB_LINK1  = $(TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT)
! TARGET_LIB_LINK2  = $(TARGET_LIBNAME).so
  
  # ----------------------------------------------------------------------------
--- 18,22 ----
  # ----------------------------------------------------------------------------
  
! WXLUA_TARGET_LIBNAME = lib$(WXLUASOCKET_LIB)
  
  # ----------------------------------------------------------------------------
***************
*** 49,71 ****
  	$(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
  
! all: $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED)
! 
! $(TARGET_LIB_STATIC) : $(OBJECTS)
! 	@$(RM) $@
! 	$(AR) $(AROPTIONS) $@ $(OBJECTS)
! 	$(RANLIB) $@
! 
! $(TARGET_LIB_SHARED): $(OBJECTS)
! 	$(CXX) -shared -o $@ $(OBJECTS) $(LIBEXTRALIBS)
! 	cd $(TARGET_LIBDIR) \
!                 && $(RM) $(TARGET_LIB_LINK1) $(TARGET_LIB_LINK2) \
!                 && $(LN_S) $(TARGET_LIB_SHARED) $(TARGET_LIB_LINK1) \
!                 && $(LN_S) $(TARGET_LIB_SHARED) $(TARGET_LIB_LINK2)
  
! clean:
! 	rm -f core $(OBJECTS) $(DEPFILES) \
! 	      $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) \
!               $(TARGET_LIBDIR)/$(TARGET_LIB_LINK1) \
!               $(TARGET_LIBDIR)/$(TARGET_LIB_LINK2)
  
  # ----------------------------------------------------------------------------
--- 43,49 ----
  	$(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
  
! all: $(WXLUA_TARGET_LIB_STATIC) $(WXLUA_TARGET_LIB_SHARED)
  
! clean: cleanlib
  
  # ----------------------------------------------------------------------------