wxlua-commit — CVS commits of wxLua

[Wxlua-commit] wxLua/bindings readme.txt,NONE,1.1

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

Update of /cvsroot/wxlua/wxLua/bindings
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9007/wxLua/bindings

Added Files:
	readme.txt 
Log Message:
add readme.txt to descibe the wrapper files


--- NEW FILE: readme.txt ---
readme.txt - describes binding files for wxLua

The bindings for wxLua provide information for lua to interface with
the wxWindows C++ API. The binding files are a skeleton that the program
genwxbind.lua parses and turns into C functions that are imported into lua.

------------------------------------------------------------------------------
BINDING FILES
------------------------------------------------------------------------------

wxluasetup.h contains all wxLUA_USE_wxXXX
    if wxLUA_USE_XXX is 1 then it's compiled in, else ignored
    when compiling the generated cpp files.

*.i are the binding files broken up by functionality

overrides.hpp contains functions that cannot be automatically wrapped
   Functions that take pointers or references and return values through
   the variables passed in must be reworked to return multiple values.

genwxbind.lua reads wx.rules to generate the bindings 

The wrapper files have been divided in what I think is a reasonable way. 
There may be some problems with them that will arise when you start to try 
to exclude different classes in the wxluasetup.h file.

------------------------------------------------------------------------------
WRAPPER CONSTRUCTS
------------------------------------------------------------------------------

%if wxLUA_USE_XXX
    All code is ignored if wxLUA_USE_XXX is 0
    set the values of wxLUA_USE_XXX in luasetup.h
%endif wxLUA_USE_XXX

%win - the next item will #ifdefed __WXMSW__ 
%gtk - the next item will #ifdefed __WXGTK__ 

%skip - the next item is skipped, either a single item or a whole class

%stop - immediately stop processing wrapper files

%override ... %end - replace code wrapper code with this handwritten code

%builtin - this is a global function

%constructor - this is an alternate name for a constuctor
    note: it does seem possible to read the items off the stack
        and by determining their type choose the appropriate constuctor.

%rename NEW_NAME void DoStuff() - rename a method to a new name
    wxLua knows the function as void NEW_NAME() though it's accessed
    in C using DoStuff

%alias - reference a class by another name (currently unused)

%property - not really sure?

%enum [SomeEnum_Type] or [SomeBaseClass::SomeEnum_Type]
   enum_item1
   enum_item2
%end
    This adds items to a global list of enums, you may have more than
    one of the same enum. The "SomeEnum_Type" is stripped off so that
    in wxLua you get the value of the enum with "wx.enum_item1". If 
    a base class is necessary use "%enum SomeBaseClass::SomeEnum_Type"
    you still get the value in wxLua using "wx.enum_item1". 
    Is this Ok? There doesn't seem to be any conflicts yet.

%define SOME_NUMBER - adds SOME_NUMBER to a global list as a number

%define %string SOME_STRING 
    adds SOME_STRING to a global list as a string
    SOME_STRING must be defined as const wxChar * SOME_STRING = _("str") or wxT("str")
    or some way to allow it to be converted easily to const wxChar *
    in unicode or not, wxWindows does this and it's good practice
    why not use the original wxString value?
    You can't get the data from a wxString if you need to convert from unicode
    VC has problems having a wxString as a member of a struct

%define %object SOME_OBJECT
    declares a global object, use inside a class so that
    the object's methods can be known to lua

%define %pointer SOME_POINTER
    declare a global pointer, use inside a class so that
    the pointer's methods can be known to lua

%define %event wxEVT_SIZE
    declare an event type, use inside the wxEvent derived class
    it corresponds to, so the event's methods can be found

%class SomeClass [, SomeBaseClass]  
    %define %object wxTheSomeClass <- must go in the class
    %define %pointer wxTheSomeClassPointer <- must go in the class

    int GetStuff(bool all_of_it) const <- member functions
    void SetStuff(int stuff)
    %member int m_x
%endclass
    Declare a class and optionally it's base class. All the methods of the
    base class can be accessed by the class. 

%member - declare a member variable for a class
    %member int m_x 
         methods Get_m_x() and Set_m_x(val)
         properties class.m_x = val and val = class.m_x
    %rename X %member int m_x
         methods GetX() and SetX(val)
         properties class.m_x = val and val = class.m_x

%include "somefile.h" - includes a header file, C code is #include "somefile.h"

%includefile somewrapper.i - includes another wrapper file that is immediately
    processed, when finished processing continues on the original wrapper

[Wxlua-commit] wxLua/apps/wxluaedit readme.txt,NONE,1.1

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

Update of /cvsroot/wxlua/wxLua/apps/wxluaedit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6659/wxLua/apps/wxluaedit

Added Files:
	readme.txt 
Log Message:
add readme describing wxluaeditor


--- NEW FILE: readme.txt ---
wxLuaEditor is an application and sample program that demonstrates an embedded 
wxLua interpreter. This means that wxLua is run in the same thread as the 
main program and "threading" is done by using lua's debug facility to run the
wxWidgets message pump and see if the user has pressed stop. The editor
itself can load/save/run lua programs and it also has a console for entering
single line lua code for quick testing.

------------------------------------------------------------------------------
Building
------------------------------------------------------------------------------

wxLuaEditor depends on the wxcode.sourceforge.net component wxstedit for it's
scintilla text editor functionality. You must have compiled wxstedit first and
set the environment variable WXCODE to point to the root direction of wxCode.

------------------------------------------------------------------------------
Files
------------------------------------------------------------------------------

wxluaedit.cpp    -- sample IDE type editor
Makefile         -- gmake for gcc to compile the wxluaedit program (unix)
wxledit.cpp      -- contains an editor, shell, console class
wxLedit.h

The two files wxledit.h/cpp can be easily used in another project by simply
adding them to your project's build.

[Wxlua-commit] wxLua/apps/wxluaedit/src Makefile,NONE,1.1 wxledit.cpp,NONE,1.1 wxledit.h,NONE,1.1 wxluaedit.cpp,NONE,1.1 wxluaedit.rc,NONE,1.1

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

Update of /cvsroot/wxlua/wxLua/apps/wxluaedit/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5356/wxLua/apps/wxluaedit/src

Added Files:
	Makefile wxledit.cpp wxledit.h wxluaedit.cpp wxluaedit.rc 
Log Message:
remove more dead files
add back univ platform for defsutils.i
cleanup wx.rules
add wxluaeditor, an embedded sample editor using wxSTEditor


--- NEW FILE: wxluaedit.rc ---
#include "wx/msw/wx.rc"

--- NEW FILE: wxluaedit.cpp ---
/////////////////////////////////////////////////////////////////////////////
// Name:        wxluaedit.cpp
// Purpose:     wxLuaEditor app 
// Author:      John Labenski
// Modified by:
// Created:     04/01/98
// RCS-ID:
// Copyright:   (c) John Labenski
// Licence:     wxWidgets licence
/////////////////////////////////////////////////////////////////////////////

// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"

#ifdef __BORLANDC__
    #pragma hdrstop
#endif

#ifndef WX_PRECOMP
    #include "wx/wx.h"
#endif

#include "wx/image.h"
#include "wx/stedit/stedit.h"
#include "wxledit.h"
#include "wxlua/include/internal.h"

// ----------------------------------------------------------------------------
// resources and constants
// ----------------------------------------------------------------------------

#include "../../../art/wxlua.xpm"

// ----------------------------------------------------------------------------
// wxLuaEditorApp
// ----------------------------------------------------------------------------

class wxLuaEditorApp : public wxApp
{
public:

    virtual bool OnInit();
};

// ----------------------------------------------------------------------------
// wxLuaEditorFrame
// ----------------------------------------------------------------------------

class wxLuaEditorFrame : public wxSTEditorFrame
{
public:

    wxLuaEditorFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
                     long frame_style = wxDEFAULT_FRAME_STYLE) : wxSTEditorFrame()
    {
        Create(title, pos, size, frame_style);
    }

    bool Create(const wxString& title, const wxPoint& pos, const wxSize& size,
                long frame_style = wxDEFAULT_FRAME_STYLE);

    virtual bool HandleMenuEvent( wxCommandEvent &event );
    void OnAbout(wxCommandEvent& event);
    
    wxLuaConsole *m_luaConsole;

private:
    DECLARE_ABSTRACT_CLASS(wxLuaEditorFrame)
    DECLARE_EVENT_TABLE()
};

// ----------------------------------------------------------------------------
// wxLuaEditorApp
// ----------------------------------------------------------------------------

IMPLEMENT_APP(wxLuaEditorApp)

bool wxLuaEditorApp::OnInit()
{
    wxInitAllImageHandlers();

    wxLuaEditorFrame *frame = new wxLuaEditorFrame(_T("wxLuaEditor"),
                                            wxPoint(20, 20), wxSize(600, 400));

    long frameOpts = STF_DEFAULT_OPTIONS & (~STF_CREATE_NOTEBOOK) & (~STF_CREATE_SIDEBAR);
    wxSTEditorOptions steOptions(STE_DEFAULT_OPTIONS,
                                 STS_DEFAULT_OPTIONS,
                                 STN_DEFAULT_OPTIONS,
                                 STE_CONFIG_DEFAULT_OPTIONS,
                                 frameOpts,
                                 wxT("untitled.lua"));

    frame->CreateOptions(steOptions);
    wxIcon icon;
    icon.CopyFromBitmap(wxBitmap(LUA_xpm));
    frame->SetIcon(icon);

    frame->GetToolBar()->AddSeparator();
    frame->m_luaConsole->PopulateToolBar(frame->GetToolBar(), LUACON_TB_LUA);
    frame->m_luaConsole->SetToolBar(frame->GetToolBar());
    frame->m_luaConsole->SetMenuBar(frame->GetMenuBar());  
    
    // The size of the frame isn't set when the splitter is created, resize it
    wxSplitterWindow *splitWin = frame->m_luaConsole->GetSplitterWin();
    splitWin->SetSashPosition(splitWin->GetSize().y/2);

    frame->Show(TRUE);

    return TRUE;
}

// ----------------------------------------------------------------------------
// wxLuaEditorFrame
// ----------------------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxLuaEditorFrame, wxSTEditorFrame)

BEGIN_EVENT_TABLE(wxLuaEditorFrame, wxSTEditorFrame)
END_EVENT_TABLE()

bool wxLuaEditorFrame::Create(const wxString& title, const wxPoint& pos, const wxSize& size,
                              long frame_style)
         
{
    m_luaConsole = NULL;
    if (!wxSTEditorFrame::Create(NULL, -1, title, pos, size, frame_style))
        return false;

    m_sideSplitter = new wxSplitterWindow(this, wxID_ANY);
    m_sideSplitter->SetMinimumPaneSize(10);
    m_sideNotebook = new wxNotebook(m_sideSplitter, wxID_ANY);
    m_fileListBox = new wxListBox(m_sideNotebook, ID_STF_FILELISTBOX, 
                                  wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE );
    m_sideNotebook->AddPage(m_fileListBox, wxT("Files"));
    m_sideSplitterWin1 = m_sideNotebook;

    m_luaConsole = new wxLuaConsole(m_sideSplitter, -1, wxDefaultPosition, wxSize(400,600), 0, 0);
    m_editorNotebook = m_luaConsole->GetEditorNotebook();
    m_sideSplitterWin2 = m_luaConsole;
    
    return true;
}

bool wxLuaEditorFrame::HandleMenuEvent(wxCommandEvent &event)
{
    wxWindow *focusWin = FindFocus();

    switch (event.GetId())
    {
        case wxID_ABOUT : 
        {
            OnAbout(event); 
            return true;
        }
        case wxID_CUT       :
        case wxID_COPY      :
        case wxID_PASTE     :
        case wxID_SELECTALL :
        {
            // These windows only handle these IDs
            if (focusWin == m_luaConsole->GetLuaOutputWin())
                return m_luaConsole->GetLuaOutputWin()->HandleMenuEvent(event);
            if (focusWin == m_luaConsole->GetLuaShellWin()) 
                return m_luaConsole->GetLuaShellWin()->HandleMenuEvent(event);

            break;
        }

        default : break;
    }

    if (!wxSTEditorFrame::HandleMenuEvent(event))
        m_luaConsole->OnMenu(event);
        
    return true;
}

void wxLuaEditorFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{
    // since the dialog is modal, it's ok that the interpreter is created on the stack
    wxLuaInterpreter interpreter(NULL, -1);

    // Create a script to run
    //    local msg = "Welcome to wxLua!\n"
    //    msg = msg..string.format("%s", "This dialog is created from a wxLua script.")
    //    wx.wxMessageBox(msg, "About wxLua Embedded", wx.wxOK + wx.wxICON_INFORMATION)

    wxString script;
    script += wxT("local msg = \"Welcome to wxLuaEditor!\\n\"");
    script += wxT("msg = msg..string.format(\"%s\", \"This dialog is created from a wxLua script.\")");
    script += wxT("wx.wxMessageBox(msg, \"About wxLua Embedded\", wx.wxOK + wx.wxICON_INFORMATION)");

    interpreter.RunString(script);

    // Equivalent code
    //wxString msg;
    //msg.Printf( _T("This is the About dialog of the minimal sample.\n")
    //            _T("Welcome to %s"), wxVERSION_STRING);
    //wxMessageBox(msg, _T("About Minimal"), wxOK | wxICON_INFORMATION, this);
}

--- NEW FILE: wxledit.h ---
/////////////////////////////////////////////////////////////////////////////
// Name:        wxledit.h
// Purpose:     A shell, editor and IDE widget for wxLua
// Author:      John Labenski
// Modified by:
// Created:     11/05/2002
// Copyright:   (c) John Labenski
// Licence:     wxWidgets licence
/////////////////////////////////////////////////////////////////////////////

#ifndef _WX_LUAEDITOR_H_
#define _WX_LUAEDITOR_H_

#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
    #pragma interface "wxledit.h"
#endif

class WXDLLEXPORT wxMenu;
class WXDLLEXPORT wxKeyEvent;
class WXDLLEXPORT wxNotebook;
class WXDLLEXPORT wxSplitterWindow;
class WXDLLEXPORT wxToolBar;
class WXDLLEXPORT wxLuaInterpreter;
class WXDLLEXPORT wxLuaEvent;

#include "wx/stedit/stedit.h"
#include "wx/stedit/steshell.h"

enum
{
    // buttons
    ID_LUACON_LOAD_LUA = ID_STE__LAST + 1,
    ID_LUACON_SAVEAS_LUA,
    ID_LUACON_RUN_LUA,
    ID_LUACON_BREAK_LUA,
    ID_LUACON_SHOW_STACK,

    ID_LUACON_TOGGLE_BREAKPOINT,

    // windows
    ID_LUACON_EDITOR_NOTEBOOK,
    ID_LUACON_MSG_NOTEBOOK,
    ID_LUACON_SHELL,
    ID_LUACON_OUTPUT_WIN
};

//-----------------------------------------------------------------------------
// Events for the wxLuaShell and wxLuaConsole when a wxLua interpreter is
// being created. You may intercept this event to adjust or run strings
// to finish creating the wxLua interpreter.
//
// EVT_LUASHELL_wxLUA_CREATION(id, wxLuaEvent& fn)
// EVT_LUACONSOLE_wxLUA_CREATION(id, wxLuaEvent& fn)
//-----------------------------------------------------------------------------

BEGIN_DECLARE_EVENT_TYPES()
    DECLARE_LOCAL_EVENT_TYPE(wxEVT_LUASHELL_wxLUA_CREATION,   7000)
    DECLARE_LOCAL_EVENT_TYPE(wxEVT_LUACONSOLE_wxLUA_CREATION, 7001)
END_DECLARE_EVENT_TYPES()

#define EVT_LUASHELL_wxLUA_CREATION(id, fn)   DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUASHELL_wxLUA_CREATION,   id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ),
#define EVT_LUACONSOLE_wxLUA_CREATION(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUACONSOLE_wxLUA_CREATION, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ),

//-----------------------------------------------------------------------------
// wxLuaShell - a basic console type interactive interpreter widget
//-----------------------------------------------------------------------------

class WXDLLEXPORT wxLuaShell : public wxSTEditorShell
{
public :
    wxLuaShell( wxWindow *parent, wxWindowID id,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,
                const wxString& name = wxT("wxLuaShell"));

    virtual ~wxLuaShell();

    // Get the interpreter this shell uses
    wxLuaInterpreter *GetLuaInterpreter() const { return m_luaInterpreter; }
    // Set this shell to use another interpreter, will delete it if !is_static
    //   note shell has built in function
    virtual void SetLuaInterpreter(wxLuaInterpreter *interp, bool is_static);
    // Used to create/recreate local interpreter
    //   Can be subclassed to use your own interpreter derived from a wxLuaInterpreter
    //   or a new interpreter can be set in by catching the wxEVT_LUASHELL_wxLUA_CREATION
    //   wxLuaEvent that's sent with this control's id and *this as the GetEventObject
    //   the preferred window ID is in event.GetExtraLong()
    //   if you call event.SetLuaInterpreter(new wxLuaInterpreter(...))
    //   and event.SetInt(1 for static interpreter or 0 for not static)
    //   then SetLuaIntpreter(event.GetLuaInterpreter(), event.GetInt() == 1)
    //   is called. You'll probably want to set the lua interpreter's eventhandler
    //   to this as well as it's win id
    virtual bool RecreateLuaInterpreter(wxEvtHandler *evtHandler, int win_id);

    // Run a string, append the string if append_text
    bool RunString(const wxString& string, bool append_text = false);

    // implementation
    void OnSTEEvent(wxSTEditorEvent& event);
    void OnLua(wxLuaEvent& event);

protected:
    wxLuaInterpreter *m_luaInterpreter;
    bool m_luaInterpreter_static;

private:
    void Init();
    DECLARE_EVENT_TABLE();
    DECLARE_CLASS(wxLuaShell);
};

//-----------------------------------------------------------------------------
// wxLuaEditor - a notebook page for editing a lua program
//-----------------------------------------------------------------------------

class WXDLLEXPORT wxLuaEditor : public wxSTEditor
{
public :
    wxLuaEditor(wxWindow *parent, wxWindowID id,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,
                const wxString& name = wxT("wxLuaEditor"));

    virtual ~wxLuaEditor() {}

    enum mark_Type
    {
        marginError = STE_MARGIN_MARKER,
        marginBreak = STE_MARGIN_MARKER,
        markerError = 2,
        markerBreak = 3
    };

    void ClearBreakpoints();
    bool HasBreakpoint(int line); // if line = -1 means has any breakpoints
    void AddBreakpoint(int line);
    void DeleteBreakpoint(int line);

    // implementation
    void OnMenu(wxCommandEvent& event);
    void OnMarginClick( wxStyledTextEvent &event );

private:
    DECLARE_EVENT_TABLE();
    DECLARE_CLASS(wxLuaEditor);
};

//-----------------------------------------------------------------------------
// wxLuaConsole - toolbar at the top for open/save/run/stop lua programs
//            notebook with editors for editing lua programs
//            notebook with a console and an output window for above editors
//-----------------------------------------------------------------------------

enum wxLuaConsole_Styles
{
    LUACON_TB_FILE = 0x0001,
    LUACON_TB_LUA  = 0x0002,
    LUACON_TOOLBAR = LUACON_TB_FILE|LUACON_TB_LUA,
    LUACON_DEFAULT = LUACON_TOOLBAR
};

class WXDLLEXPORT wxLuaConsole : public wxWindow
{
public:
    wxLuaConsole() : wxWindow() { Init(); }
    wxLuaConsole( wxWindow *parent, wxWindowID id,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
                  long options = LUACON_DEFAULT,
                  const wxString& name = wxT("wxLuaConsole"))
                  : wxWindow()
    {
        Init();
        Create(parent, id, pos, size, style, options, name);
    }

    bool Create( wxWindow *parent, wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 long options = LUACON_DEFAULT,
                 const wxString& name = wxT("wxLuaConsole"));

    virtual ~wxLuaConsole();

    // Get the interpreter this shell uses
    wxLuaInterpreter *GetLuaInterpreter() const { return m_luaInterpreter; }
    // Set this shell to use another interpreter, will delete it if !is_static
    //   note shell has built in function
    virtual void SetLuaInterpreter(wxLuaInterpreter *interp, bool is_static);
    // Used to create/recreate local interpreter
    //   Can be subclassed to use your own interpreter derived from a wxLuaInterpreter
    //   or a new interpreter can be set in by catching the wxEVT_LUASHELL_wxLUA_CREATION
    //   wxLuaEvent that's sent with this control's id and *this as the GetEventObject
    //   the preferred window ID is in event.GetExtraLong()
    //   if you call event.SetLuaInterpreter(new wxLuaInterpreter(...))
    //   and event.SetInt(1 for static interpreter or 0 for not static)
    //   then SetLuaIntpreter(event.GetLuaInterpreter(), event.GetInt() == 1)
    //   is called. You'll probably want to set the lua interpreter's eventhandler
    //   to this as well as it's win id
    virtual bool RecreateLuaInterpreter(wxEvtHandler *evtHandler, int win_id);

    virtual void OutputLuaEvent(wxLuaEvent &event, wxLuaShell *outputWin);

    wxSplitterWindow *GetSplitterWin() const { return m_splitter; }
    wxSTEditorNotebook *GetEditorNotebook() const { return m_editorNotebook; }
    wxSTEditorNotebook *GetMsgNotebook() const { return m_msgNotebook; }
    wxLuaShell *GetLuaOutputWin() const { return m_luaOutput; }
    wxLuaShell *GetLuaShellWin() const { return m_luaShell; }

    // don't take ownership, just use
    void SetMenuBar(wxMenuBar *menuBar);
    wxMenuBar* GetMenuBar() const { return m_editorOptions.GetMenuBar(); } // may be NULL
    // don't take ownership, just use
    void SetToolBar(wxToolBar *toolbar);
    wxToolBar *GetToolBar() const { return m_editorOptions.GetToolBar(); } // may be NULL
    void PopulateToolBar(wxToolBar *toolBar, long options = LUACON_TOOLBAR);
    void EnableTool(int tool_id, bool enable);

    // implementation

    void OnMenu(wxCommandEvent &event);
    void OnLua(wxLuaEvent &event);

    void OnCreateEditor(wxCommandEvent &event);

protected:

    virtual void DoSetSize(int x, int y, int width, int height,
                           int sizeFlags = wxSIZE_AUTO);

    wxLuaInterpreter *m_luaInterpreter;
    bool m_luaInterpreter_static;

    wxSplitterWindow *m_splitter;
    wxSTEditorNotebook *m_editorNotebook;
    wxSTEditorNotebook *m_msgNotebook;
    wxLuaShell *m_luaOutput;
    wxLuaShell *m_luaShell;
    wxToolBar *m_toolBar;
    wxSTEditorOptions m_editorOptions;
    wxSTEditorOptions m_shellOptions;

    long m_options;

private:
    bool m_show_stack;
    void Init();

    DECLARE_EVENT_TABLE();
    DECLARE_DYNAMIC_CLASS(wxLuaConsole);
};

#endif  // _WX_LUAEDITOR_H_

--- NEW FILE: Makefile ---
# File:		Makefile
# Author:	John Labenski, J Winwood
# Created:	2004
# Updated:
# Copyright: (c) 2002. J Winwood
#
# Makefile for wxLuaEditor app using gmake

# --- wxLua parameters -------------------------------------------------------
WXLUA_LIBVERSION_CURRENT  = 1
WXLUA_LIBVERSION_REVISION = 5
WXLUA_LIBVERSION_AGE      = 0

WXLUA_DIR    = ../../..
WXLUA_LIBDIR = $(WXPREFIX)/lib

LUA = $(WXLUA_DIR)/bin/lua
# ----------------------------------------------------------------------------

# --- wxWidgets parameters from wx-config ------------------------------------
WXCONFIG  := wx-config
WXPREFIX   = $(shell $(WXCONFIG) --prefix)
WXBASENAME = $(shell $(WXCONFIG) --basename)
WXVERSION  = $(shell $(WXCONFIG) --version)
WXRELEASE  = $(shell $(WXCONFIG) --release)
WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags)
WXLDLIBS   = $(shell $(WXCONFIG) --libs)
WXCXX      = $(shell $(WXCONFIG) --cxx) 
WXLIB_DIR  = $(WXPREFIX)/lib
# ----------------------------------------------------------------------------

CXXFLAGS = $(WXCXXFLAGS) -MMD -g -Wall
LDLIBS   = $(WXLDLIBS)
CXX      = $(WXCXX)

PROGRAM = wxLuaEditor

LUA_LIBS        = $(WXLUA_DIR)/lib/liblua.a $(WXLUA_DIR)/lib/liblualib.a 
WXLUA_LIB       = $(WXBASENAME)_wxlua-$(WXRELEASE)
WXLUADEBUG_LIB  = $(WXBASENAME)_wxluadebug-$(WXRELEASE)
WXLUASOCKET_LIB = $(WXBASENAME)_wxluasocket-$(WXRELEASE)
WXLUABIND_LIB   = $(WXBASENAME)_wxluabind-$(WXRELEASE)
WXSTC_LIB       = $(WXBASENAME)_stc-$(WXRELEASE)
WXXRC_LIB       = $(WXBASENAME)_xrc-$(WXRELEASE)
WXFL_LIB        = $(WXBASENAME)_fl-$(WXRELEASE)

# The wxSTEditor library name compiled from wxCode/components/wxstedit
WXSTEDIT_LIB    = $(WXBASENAME)_stedit-$(WXRELEASE)

APPEXTRADEFS=-I$(WXCODE)/components/wxstedit/include -I$(WXLUA_DIR)/modules -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL=

# This will build a static wxLua app, staticly linked to .a libs
#APPEXTRALIBS=-L$(WXLIB_DIR) $(WXLIB_DIR)/lib$(WXLUA_LIB).a $(WXLIB_DIR)/lib$(STC_LIB).a $(WXLIB_DIR)/lib$(WXXRC_LIB).a $(WXLIB_DIR)/lib$(WXFL_LIB).a $(LUA_LIBS)

# This will build a shared wxLua app, dynamicly linked to .so libs
#  -l$(WXFL_LIB)
APPEXTRALIBS=-L$(WXLIB_DIR) -L$(WXLUA_LIBDIR) -l$(WXSTEDIT_LIB) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) -l$(WXSTC_LIB) -l$(WXXRC_LIB) $(LUA_LIBS) -l$(WXLUABIND_LIB)

OBJECTS  = wxluaedit.o wxledit.o
DEPFILES = $(OBJECTS:.o=.d)

.cpp.o:
	$(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<

all: lua wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindings $(PROGRAM)  

$(PROGRAM): $(OBJECTS) $(LUA_LIBS)
	$(CXX) -o $@ $(OBJECTS) $(LDLIBS) $(APPEXTRALIBS) 

lua:
	@(cd $(WXLUA_DIR)/modules/lua && make)

bindings: 
	@(cd $(WXLUA_DIR)/bindings/wxwidgets && make)

editor:
	$(LUA) $(WXLUA_DIR)/util/bin2c/bin2c.lua -t $(WXLUA_DIR)/samples/editor.wx.lua wxLuaEditor > editor.h

wxLuaBindings:
	@(cd $(WXLUA_DIR)/modules/wxbind/src && make)

wxLuaLib:
	@(cd $(WXLUA_DIR)/modules/wxlua/src && make)

wxLuaDebugLib:
	@(cd $(WXLUA_DIR)/modules/wxluadebug/src && make)

wxLuaSocketLib:
	@(cd $(WXLUA_DIR)/modules/wxluasocket/src && make)

clean:
	rm -f $(OBJECTS) $(DEPFILES) $(PROGRAM) core

cleanall:
	rm -f $(OBJECTS) $(DEPFILES) $(PROGRAM) core
	@(cd $(WXLUA_DIR)/modules/lua && make clean)
	@(cd $(WXLUA_DIR)/bindings/wxwidgets && make clean)
	@(cd $(WXLUA_DIR)/modules/wxbind/src && make clean)
	@(cd $(WXLUA_DIR)/modules/wxlua/src && make clean)
	@(cd $(WXLUA_DIR)/modules/wxluadebug/src && make clean)
	@(cd $(WXLUA_DIR)/modules/wxluasocket/src && make clean)

-include $(DEPFILES)

--- NEW FILE: wxledit.cpp ---
/////////////////////////////////////////////////////////////////////////////
// Name:        wxledit.cpp
// Purpose:     Different editors, consoles for wxLua
// Author:      John Labenski
// Modified by:
// Created:     11/05/2002
// RCS-ID:
// Copyright:   (c) John Labenski
// Licence:     wxWidgets licence
/////////////////////////////////////////////////////////////////////////////

#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
    #pragma implementation "wxledit.h"
#endif

// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"

#ifdef __BORLANDC__
    #pragma hdrstop
#endif

#ifndef WX_PRECOMP
    #include "wx/wx.h"
#endif // WX_PRECOMP

#include "wx/filename.h"
#include "wx/splitter.h"

#include "wxledit.h"
#include "wxlua/include/interp.h"
#include "wxluadebug/include/staktree.h"
#include "wxluadebug/include/debug.h"

#include "../../../art/wxlua.xpm"
#include "../../../art/open.xpm"
#include "../../../art/save.xpm"
#include "../../../art/play.xpm"
#include "../../../art/stop.xpm"

#define STC_DEF_MARGIN_WIDTH 16

DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUASHELL_wxLUA_CREATION)
DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUACONSOLE_wxLUA_CREATION)

//-----------------------------------------------------------------------------
// wxLuaShell
//-----------------------------------------------------------------------------
IMPLEMENT_CLASS(wxLuaShell, wxSTEditorShell)

BEGIN_EVENT_TABLE(wxLuaShell, wxSTEditorShell)
    EVT_STESHELL_ENTER ( wxID_ANY, wxLuaShell::OnSTEEvent )
    EVT_LUA_CONSOLE    ( wxID_ANY, wxLuaShell::OnLua )
    EVT_LUA_WARNING    ( wxID_ANY, wxLuaShell::OnLua )
    EVT_LUA_ERROR      ( wxID_ANY, wxLuaShell::OnLua )
END_EVENT_TABLE()

void wxLuaShell::Init()
{
    m_luaInterpreter        = NULL;
    m_luaInterpreter_static = false;
}

wxLuaShell::wxLuaShell(wxWindow *parent, wxWindowID id,
                       const wxPoint& pos, const wxSize& size,
                       long style, const wxString& name)
{
    Init();

    wxSTEditorShell::Create(parent, id, pos, size, style, name);

    SetFileName(name, false);
    SetLanguage(wxT("a.lua"));
}

wxLuaShell::~wxLuaShell()
{
    if (m_luaInterpreter && !m_luaInterpreter_static)
        delete m_luaInterpreter;
}

void wxLuaShell::SetLuaInterpreter(wxLuaInterpreter *interp, bool is_static)
{
    if (m_luaInterpreter && !m_luaInterpreter_static)
    {
        if (m_luaInterpreter->Ok() && m_luaInterpreter->IsRunning())
            m_luaInterpreter->Break();

        delete m_luaInterpreter;
    }

    m_luaInterpreter        = interp;
    m_luaInterpreter_static = is_static;
}

bool wxLuaShell::RecreateLuaInterpreter(wxEvtHandler *evtHandler, int win_id)
{
    wxLuaEvent event(wxEVT_LUASHELL_wxLUA_CREATION, GetId(), NULL);
    event.SetEventObject(this);
    event.SetInt(0);
    event.SetExtraLong(win_id);
    GetEventHandler()->ProcessEvent( event );

    if (event.GetLuaInterpreter() != NULL)
    {
        SetLuaInterpreter(event.GetLuaInterpreter(), event.GetInt() == 1);
        return true;
    }

    wxLuaInterpreter *interp = new wxLuaInterpreter(evtHandler, win_id);
    interp->SetLuaDebugHook( 1000, 50, false, LUA_MASKCOUNT );
    SetLuaInterpreter(interp, false);

    return true;
}

bool wxLuaShell::RunString(const wxString& string, bool append_text)
{
    bool ret = false;

    if (string.IsEmpty())
        return ret;

    if (append_text)
    {
        if (!GetLine(GetLineCount()).IsEmpty())
            AppendText(wxT("\n"));

        AppendText(string);
    }

    AppendText(wxT("\n"));

    // restart the interpreter
    if (string == wxT("reset"))
    {
        if (m_luaInterpreter_static)
        {
            AppendText(wxT("Unable to reset lua, interpreter locked by another process.\n"));
        }
        else
        {
            if (RecreateLuaInterpreter(GetEventHandler(), GetId()))
            {
                AppendText(wxT("Sucessfully reset interpreter.\n"));
                ret = true;
            }
            else
                AppendText(wxT("Unsucessfully reset interpreter.\n"));
        }
    }
    else if (m_luaInterpreter)
        ret = m_luaInterpreter->RunString(string) == 0;
    else
        AppendText(wxT("The lua interpreter is not available - try running 'reset'.\n"));

    CheckPrompt(true);

    return ret;
}

void wxLuaShell::OnSTEEvent(wxSTEditorEvent& event)
{
    event.Skip();
    if (event.GetEventType() == wxEVT_STESHELL_ENTER)
        RunString(event.GetString(), false);
}

void wxLuaShell::OnLua(wxLuaEvent &event)
{
    if (event.GetEventType() == wxEVT_LUA_CONSOLE)
    {
        AppendText(event.GetString() + wxT("\n"));
    }
    else if (event.GetEventType() == wxEVT_LUA_WARNING)
    {
        AppendText(wxT("\nWarning: ") + event.GetString() + wxT("\n"));
    }
    else if (event.GetEventType() == wxEVT_LUA_ERROR)
    {
        AppendText(wxT("\nErr: ") + event.GetString() + wxT("\n"));
    }
    else
        event.Skip();
}

//-----------------------------------------------------------------------------
// wxLuaEditor
//-----------------------------------------------------------------------------
IMPLEMENT_CLASS(wxLuaEditor, wxSTEditor)

BEGIN_EVENT_TABLE(wxLuaEditor, wxSTEditor)
    EVT_STC_MARGINCLICK(wxID_ANY, wxLuaEditor::OnMarginClick)
    EVT_MENU(ID_LUACON_TOGGLE_BREAKPOINT, wxLuaEditor::OnMenu)
END_EVENT_TABLE()

wxLuaEditor::wxLuaEditor(wxWindow *parent, int id,
                         const wxPoint& pos, const wxSize& size,
                         long style, const wxString& name)
                         : wxSTEditor()
{
    wxSTEditor::Create(parent, id, pos, size, style, name);

    SetVisiblePolicy(wxSTC_VISIBLE_SLOP, 3);
    SetXCaretPolicy(wxSTC_CARET_SLOP, 10);
    SetYCaretPolicy(wxSTC_CARET_SLOP, 3);

    // click on margin to set breakpoint
    //  wxSTC_MARK_CIRCLE
    MarkerDefine(markerBreak, wxSTC_MARK_SMALLRECT,  *wxBLACK, *wxRED);
    MarkerDefine(markerError, wxSTC_MARK_SHORTARROW, *wxBLACK, *wxRED);

    SetMarginSensitive(marginBreak, true);
    SetMarginType(marginError, wxSTC_MARGIN_SYMBOL);
    SetMarginWidth(marginError, STC_DEF_MARGIN_WIDTH);
    //SetMarginMask(marginError, (1<<markerError)|(1<<markerBreak)|(1<<STE_BOOKMARK_MARKER));

    SetFileName(wxT("untitled.lua"));
    SetLanguage(wxT("untitled.lua"));
}

void wxLuaEditor::OnMenu(wxCommandEvent& event)
{
    int line = LineFromPosition(GetInsertionPoint());

    switch (event.GetId())
    {
        case ID_LUACON_TOGGLE_BREAKPOINT :
        {
            if (HasBreakpoint(line))
                DeleteBreakpoint(line);
            else
                AddBreakpoint(line);

            return;
        }
    }

    event.Skip();
}

void wxLuaEditor::OnMarginClick( wxStyledTextEvent &event )
{
    // unfortunately we can't get right or double clicks
    event.Skip();
    //int line = event.GetLine();   - not implemented
    //wxPrintf(wxT("Margin line %d %d %d %d %d\n"), line, event.GetLine(), MarkerGet(line), event.GetModifiers(), event.GetKey()); fflush(stdout);
}

bool wxLuaEditor::HasBreakpoint(int line)
{
    if (line < 0)
        return MarkerNext(markerBreak, 1<<markerBreak) >= 0;

    return (MarkerGet(line) & (1<<markerBreak)) != 0;
}
void wxLuaEditor::ClearBreakpoints()
{
    MarkerDeleteAll(markerBreak);
}
void wxLuaEditor::AddBreakpoint(int line)
{
    if (HasBreakpoint(line) || (line<0) || (line>GetLineCount()))
        return;

    (void)MarkerAdd(line, markerBreak);
}
void wxLuaEditor::DeleteBreakpoint(int line)
{
    if (!HasBreakpoint(line))
        return;

    MarkerDelete(line, markerBreak);
}

//-----------------------------------------------------------------------------
// wxLuaConsole
//-----------------------------------------------------------------------------

IMPLEMENT_DYNAMIC_CLASS(wxLuaConsole, wxWindow);

BEGIN_EVENT_TABLE(wxLuaConsole, wxWindow)

    EVT_MENU(ID_LUACON_LOAD_LUA,   wxLuaConsole::OnMenu)
    EVT_MENU(ID_LUACON_SAVEAS_LUA, wxLuaConsole::OnMenu)
    EVT_MENU(ID_LUACON_RUN_LUA,    wxLuaConsole::OnMenu)
    EVT_MENU(ID_LUACON_BREAK_LUA,  wxLuaConsole::OnMenu)
    EVT_MENU(ID_LUACON_SHOW_STACK, wxLuaConsole::OnMenu)

    EVT_STS_CREATE_EDITOR(wxID_ANY, wxLuaConsole::OnCreateEditor)

    EVT_LUA_CONSOLE     (wxID_ANY, wxLuaConsole::OnLua)
    EVT_LUA_WARNING     (wxID_ANY, wxLuaConsole::OnLua)
    EVT_LUA_ERROR       (wxID_ANY, wxLuaConsole::OnLua)
    EVT_LUA_DEBUG_HOOK  (wxID_ANY, wxLuaConsole::OnLua)
    EVT_LUA_SHUTDOWN    (wxID_ANY, wxLuaConsole::OnLua)
END_EVENT_TABLE()

void wxLuaConsole::Init()
{
    m_luaInterpreter = NULL;
    m_luaInterpreter_static = false;

    m_splitter = NULL;
    m_editorNotebook = NULL;
    m_msgNotebook = NULL;
    m_luaOutput = NULL;
    m_luaShell = NULL;
    m_toolBar = NULL;

    m_options = 0;
    m_show_stack = false;
}

bool wxLuaConsole::Create( wxWindow *parent, int id,
                           const wxPoint& pos, const wxSize& size,
                           long style, long options, const wxString& name)
{
    m_options = options;

    if (!wxWindow::Create(parent, id, pos, size, style, name))
        return false;

    if ((m_options & LUACON_TOOLBAR) != 0)
    {
        m_toolBar = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize);
        PopulateToolBar(m_toolBar, m_options);
        EnableTool(ID_LUACON_BREAK_LUA, false);
    }

    m_splitter = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxSize(200,400));

    // Create the editor notebook
    m_editorOptions = wxSTEditorOptions(STE_DEFAULT_OPTIONS);

    m_editorOptions.SetToolBar(m_toolBar); // NULL is fine
    m_editorOptions.SetDefaultFileName(wxT("untitled.lua"));
    m_editorNotebook = new wxSTEditorNotebook(m_splitter, ID_LUACON_EDITOR_NOTEBOOK,
          wxDefaultPosition, wxSize(200,200), wxCLIP_CHILDREN);
    m_editorNotebook->CreateOptions(m_editorOptions);
    m_editorNotebook->InsertEditorSplitter(-1, wxID_ANY, wxT("untitled.lua"), true);

    m_editorNotebook->GetEditor()->MarkerDefine(wxLuaEditor::markerBreak, wxSTC_MARK_SMALLRECT,  *wxBLACK, *wxRED);
    m_editorNotebook->GetEditor()->MarkerDefine(wxLuaEditor::markerError, wxSTC_MARK_SHORTARROW, *wxBLACK, *wxRED);

    wxMenu *breakPointMenu = new wxMenu;
    breakPointMenu->Append(ID_LUACON_TOGGLE_BREAKPOINT, wxT("&Toggle breakpoint"));
    m_editorOptions.GetEditorPopupMenu()->AppendSeparator();
    m_editorOptions.GetEditorPopupMenu()->Append(wxID_ANY, wxT("Breakpoints"), breakPointMenu);

    // Create the message notebook for shell and output window
    m_shellOptions.SetSplitterOptions(STS_NO_EDITOR);
    m_shellOptions.SetEditorStyles(m_editorOptions.GetEditorStyles());
    m_shellOptions.SetEditorLangs(m_editorOptions.GetEditorLangs());
    m_shellOptions.SetMenuManager(m_editorOptions.GetMenuManager(), true);
    m_shellOptions.SetEditorPopupMenu(wxSTEditorMenuManager(0, 0, STE_MENU_EDIT_CUTCOPYPASTE).CreateEditMenu(), false);
    m_shellOptions.SetToolBar(m_toolBar);
    m_msgNotebook = new wxSTEditorNotebook(m_splitter, ID_LUACON_MSG_NOTEBOOK,
            wxDefaultPosition, wxSize(200,200), wxCLIP_CHILDREN);
    m_msgNotebook->CreateOptions(m_shellOptions);

    wxSTEditorSplitter *splitter = new wxSTEditorSplitter(m_msgNotebook, wxID_ANY,
                                 wxDefaultPosition, wxDefaultSize, wxSP_3D);
    splitter->CreateOptions(m_shellOptions);
    m_luaShell = new wxLuaShell(splitter, ID_LUACON_SHELL, wxDefaultPosition,
                                wxSize(200,200), 0);
    m_luaShell->CreateOptions(m_shellOptions);
    m_luaShell->SetWrapMode(wxSTC_WRAP_WORD);
    m_luaShell->RecreateLuaInterpreter(m_luaShell->GetEventHandler(), m_luaShell->GetId());
    m_luaShell->CheckPrompt(true);
    splitter->Initialize(m_luaShell);
    m_msgNotebook->InsertEditorSplitter(-1, splitter, true);

    splitter = new wxSTEditorSplitter(m_msgNotebook, wxID_ANY,
                        wxDefaultPosition, wxDefaultSize, wxSP_3D);
    splitter->CreateOptions(m_shellOptions);
    m_luaOutput = new wxLuaShell(splitter, ID_LUACON_OUTPUT_WIN, wxDefaultPosition,
                                 wxSize(200,200), 0);
    m_luaOutput->CreateOptions(m_shellOptions);
    splitter->Initialize(m_luaOutput);
    m_luaOutput->MarkerDeleteAll(wxLuaShell::markerPrompt);
    m_luaOutput->SetLuaInterpreter(m_luaInterpreter, true);
    m_luaOutput->SetWrapMode(wxSTC_WRAP_NONE);
    m_luaOutput->SetFileName(wxT("Output"));
    m_msgNotebook->InsertEditorSplitter(-1, splitter, false);

    m_splitter->SetSashGravity(0.8); // let upper window grow more
    m_splitter->SetMinimumPaneSize(50);
    m_splitter->SplitHorizontally(m_editorNotebook, m_msgNotebook, GetClientSize().y/2);

    //RecreateLuaInterpreter(GetEventHandler(), m_editorNotebook->GetPage(0)->GetId());

    return true;
}

wxLuaConsole::~wxLuaConsole()
{
    delete m_luaInterpreter;
}

void wxLuaConsole::SetMenuBar(wxMenuBar *menuBar)
{
    m_editorOptions.SetMenuBar(menuBar);
    m_shellOptions.SetMenuBar(menuBar);
}

void wxLuaConsole::SetToolBar(wxToolBar *toolBar)
{
    m_editorOptions.SetToolBar(toolBar);
    m_shellOptions.SetToolBar(toolBar);

    m_toolBar = toolBar;

    if (!m_luaInterpreter || !m_luaInterpreter->IsRunning())
        EnableTool(ID_LUACON_BREAK_LUA, false);
}

void wxLuaConsole::PopulateToolBar(wxToolBar *toolBar, long options)
{
    bool add_sep = false;

    if ((options & LUACON_TB_FILE) != 0)
    {
        toolBar->AddTool( ID_LUACON_LOAD_LUA,   wxT("Open file"),  wxBitmap(open_xpm),   wxT("Open lua program") );
        toolBar->AddTool( ID_LUACON_SAVEAS_LUA, wxT("Save as..."), wxBitmap(save_xpm), wxT("Save lua program") );
        add_sep = true;
    }
    if ((options & LUACON_TB_LUA) != 0)
    {
        if (add_sep) toolBar->AddSeparator();

        toolBar->AddTool( ID_LUACON_RUN_LUA,    wxT("Run Lua"),    wxBitmap(play_xpm), wxT("Run the lua program") );
        toolBar->AddTool( ID_LUACON_BREAK_LUA,  wxT("Stop Lua"),   wxBitmap(stop_xpm), wxT("Stop the running lua program") );
        toolBar->AddSeparator();
        toolBar->AddTool( ID_LUACON_SHOW_STACK, wxT("Stack Tree"), wxBitmap(LUA_xpm),  wxT("Show the lua stack tree") );
    }
    toolBar->Realize();
}

void wxLuaConsole::EnableTool(int tool_id, bool enable)
{
    wxSTEditorMenuManager::DoEnableItem(NULL, NULL, GetToolBar(), tool_id, enable);
}

void wxLuaConsole::SetLuaInterpreter(wxLuaInterpreter *interp, bool is_static)
{
    if (m_luaInterpreter && !m_luaInterpreter_static)
    {
        if (m_luaInterpreter->Ok() && m_luaInterpreter->IsRunning())
            m_luaInterpreter->Break();

        delete m_luaInterpreter;
    }

    m_luaInterpreter = interp;
    m_luaInterpreter_static = is_static;
}

bool wxLuaConsole::RecreateLuaInterpreter(wxEvtHandler *evtHandler, int win_id)
{
    wxLuaEvent event(wxEVT_LUACONSOLE_wxLUA_CREATION, GetId(), NULL);
    event.SetEventObject(this);
    event.SetInt(0);
    event.SetExtraLong(win_id);
    GetEventHandler()->ProcessEvent( event );

    if (event.GetLuaInterpreter() != NULL)
    {
        SetLuaInterpreter(event.GetLuaInterpreter(), event.GetInt() == 1);
        return true;
    }

    wxLuaInterpreter *interp = new wxLuaInterpreter(evtHandler, win_id);
    interp->SetLuaDebugHook( 1000, 50, false, LUA_MASKCOUNT );
    SetLuaInterpreter(interp, false);
    return true;
}

void wxLuaConsole::OnCreateEditor(wxCommandEvent &event)
{
    wxWindow *win = (wxWindow*)event.GetEventObject();
    wxLuaEditor *editor = new wxLuaEditor(win, event.GetInt(),
                                          wxDefaultPosition, wxDefaultSize, 0);
    editor->CreateOptions(m_editorOptions);
    event.SetEventObject(editor);
}

void wxLuaConsole::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
    wxWindow::DoSetSize(x, y, width, height, sizeFlags);

    wxSize clientSize(GetClientSize());
    if (width  == -1) width  = clientSize.x;
    if (height == -1) height = clientSize.y;

    int h = 0;

    if (m_toolBar && (m_toolBar->GetParent() == this))
    {
        m_toolBar->SetSize(0, 1, width, -1); // y = 1 for wxGTK 2 at least
        h = m_toolBar->GetSize().y + 1;      // another +1 for bottom for wxGTK2
    }

    if (m_splitter)
    {
        m_splitter->SetSize(0, h, width, height-h);
        int sash = m_splitter->GetSashPosition();
        if ((sash < 50) || (sash > height - 50))
            m_splitter->SetSashPosition(wxMin(50, height/2));
    }
}

void wxLuaConsole::OnMenu(wxCommandEvent &event)
{
    wxLuaEditor *editor = wxDynamicCast(m_editorNotebook->GetEditor(), wxLuaEditor);
    wxCHECK_RET(editor, wxT("Invalid notebook page"));

    switch(event.GetId())
    {
        case ID_LUACON_LOAD_LUA :
        {
            wxString filename = editor->GetFileName();
            wxString path;

            if (!filename.IsEmpty())
            {
                wxFileName fn(filename);
                path = fn.GetPath();
                filename = fn.GetFullName();
            }

            wxFileDialog dlg(this, wxT("Open file"), path, filename,
                             wxT("Lua (*.lua)|*.lua|Any file (*)|*"),
                             wxOPEN|wxFILE_MUST_EXIST);
            if (dlg.ShowModal() != wxID_OK) return;
            filename = dlg.GetPath();

            if (!filename.IsEmpty())
                editor->LoadFile(filename);

            break;
        }
        case ID_LUACON_SAVEAS_LUA :
        {
            editor->SaveFile(true);
            break;
        }
        case ID_LUACON_RUN_LUA :
        {
            wxString program = editor->GetText();
            if (program.IsEmpty()) break;

            if (m_luaInterpreter)
            {
                wxCHECK_RET(m_luaInterpreter->Destroy(false), wxT("Can't destroy lua interpreter"));
            }

            // Fresh start!
            wxCHECK_RET(RecreateLuaInterpreter(GetEventHandler(), editor->GetId()), wxT("Can't recreate lua interpreter"));

            EnableTool(ID_LUACON_RUN_LUA, false);
            EnableTool(ID_LUACON_BREAK_LUA, true);
            EnableTool(ID_LUACON_SHOW_STACK, false);

            editor->MarkerDeleteAll(wxLuaEditor::markerError);

            m_luaOutput->SetReadOnly(false);
            m_luaOutput->ClearAll();
            m_luaOutput->MarkerDeleteAll(wxLuaShell::markerPrompt);
            m_luaOutput->AppendText(wxT("Running lua script : ") + wxNow() + wxT("\n"));
            wxStopWatch stopWatch;
            //m_luaOutput->SetReadOnly(true);

            wxSafeYield(); // allow tools to adjust (sometimes necessary?)

            m_luaOutput->SetLuaInterpreter(m_luaInterpreter, true);

            if (editor->HasBreakpoint(-1))
                m_luaInterpreter->SetLuaDebugHook(1, 50, true, LUA_MASKLINE);
            else
                m_luaInterpreter->SetLuaDebugHook(100, 50, false);

            m_luaOutput->SetReadOnly(true);
            editor->SetReadOnly(true);
            m_luaInterpreter->RunString(program);
            editor->SetReadOnly(false);
            m_luaOutput->SetReadOnly(false);

            m_luaOutput->AppendText(wxT("End lua script : ") + wxNow() + wxT("\n"));
            m_luaOutput->AppendText(wxString::Format(wxT("Execution time : %.3lf(s)\n"), stopWatch.Time()/1000.0));

            m_luaOutput->CheckPrompt(true);

            EnableTool(ID_LUACON_RUN_LUA, true);
            EnableTool(ID_LUACON_BREAK_LUA, false);
            EnableTool(ID_LUACON_SHOW_STACK, true);

            // don't delete it since it may "exist" as a frame or something
            // also allows for showing stack frame
            //if (m_luaInterpreter) { delete m_luaInterpreter; m_luaInterpreter = NULL; }
            break;
        }
        case ID_LUACON_BREAK_LUA :
        {
            if (m_luaInterpreter && m_luaInterpreter->IsRunning())
            {
                m_luaInterpreter->Break(wxT("Interpreter stopped"));
            }
            else if (m_luaShell->GetLuaInterpreter() && m_luaShell->GetLuaInterpreter()->IsRunning())
            {
                m_luaShell->GetLuaInterpreter()->Break(wxT("Interpreter stopped"));
            }

            break;
        }
        case ID_LUACON_SHOW_STACK :
        {
            m_show_stack = true;
            // don't want recursive wxYields if some other interpreter is running
            bool err = true;

            wxLuaInterpreter *luaInterp = NULL;
            wxLuaShell       *luaShell  = NULL;

            if (m_msgNotebook->GetSelection() == 0)
            {
                luaInterp = m_luaShell ? m_luaShell->GetLuaInterpreter() : NULL;
                luaShell  = m_luaShell;
            }
            else
            {
                luaInterp = m_luaInterpreter;
                luaShell  = m_luaOutput;
            }

            if (luaShell && luaInterp)
            {
                int  hook_count = luaInterp->GetLuaDebugHookCount();
                int  hook_yield = luaInterp->GetLuaDebugHookYield();
                bool hook_send  = luaInterp->GetLuaDebugHookSendEvt();
                int  hook_mask  = luaInterp->GetLuaDebugHook();

                luaInterp->SetLuaDebugHook(1, -1, true);
                luaInterp->RunString(wxT("print(\"Showing stack\")\n"));
                luaInterp->SetLuaDebugHook(hook_count, hook_yield, hook_send, hook_mask);
                luaShell->CheckPrompt(true);
                err = false;
            }

            if (err)
                wxMessageBox(wxT("Invalid lua interpreter."), wxT("Error showing stack"), wxOK, this);

            break;

        }
        default : break;
    }
}

void wxLuaConsole::OnLua(wxLuaEvent &event)
{
    wxLuaShell *outEditor = NULL;

    if (event.GetLuaInterpreter() == m_luaInterpreter)
        outEditor = m_luaOutput;
    else if (event.GetLuaInterpreter() == m_luaShell->GetLuaInterpreter())
        outEditor = m_luaShell;

    OutputLuaEvent(event, outEditor);
}

void wxLuaConsole::OutputLuaEvent(wxLuaEvent &event, wxLuaShell *outEditor)
{
    // perhaps there was an error at startup, but editor isn't created yet
    if (outEditor == NULL)
    {
        return;
    }

    if (event.GetEventType() == wxEVT_LUA_DEBUG_HOOK)
    {
        if (m_show_stack)
        {
            wxLuaInterface luaInterface((lua_State*)event.GetLuaState());
            wxLuaStackFrame StackFrame(this, wxT("wxLua stack frame"),
                                       wxDefaultPosition, wxSize(500, 250),
                                       &luaInterface);
            StackFrame.ShowModal();
            m_show_stack = false;
        }
        else if (event.GetEventObject() == m_luaInterpreter)
        {
            wxLuaEditor *editor = wxDynamicCast(m_editorNotebook->FindWindow(event.GetId()), wxLuaEditor);
            //wxCHECK_RET(editor, wxT("Invalid notebook page"));
            if (editor != NULL)
            {
                int line = event.GetLineNum();
                if (editor->HasBreakpoint(line-1))
                    m_luaInterpreter->Break(wxString::Format(wxT("Stopped at breakpoint, line: %d"), line));
            }
        }
    }
    else if (event.GetEventType() == wxEVT_LUA_CONSOLE)
    {
        outEditor->AppendText(event.GetString() + wxT("\n"));
    }
    else if (event.GetEventType() == wxEVT_LUA_WARNING)
    {
        outEditor->AppendText(wxT("\nWarning: ") + event.GetString() + wxT("\n"));
    }
    else if (event.GetEventType() == wxEVT_LUA_ERROR)
    {
        outEditor->AppendText(wxT("\nErr: ") + event.GetString() + wxT("\n"));

        int line = event.GetLineNum();

        // Put a marker where the error occurred
        if ((line >= 0) && (event.GetEventObject() == m_luaInterpreter))
        {
            wxLuaEditor *editor = wxDynamicCast(m_editorNotebook->FindWindow(event.GetId()), wxLuaEditor);
            //wxCHECK_RET(editor, wxT("Invalid notebook page"));
            if (editor != NULL)
            {
                editor->MarkerDeleteAll(wxLuaEditor::markerError);
                editor->MarkerAdd(line-1, wxLuaEditor::markerError);
                editor->GotoLine(line-1);
                editor->EnsureCaretVisible();
            }
        }
    }
    else if (event.GetEventType() == wxEVT_LUA_SHUTDOWN)
    {
        outEditor->AppendText(wxT("\nLua interpreter shutdown\n"));
    }
}

[Wxlua-commit] wxLua/bindings/wxwidgets defsutil.i,1.5,1.6 wx.rules,1.3,1.4 README.txt,1.1,NONE htmlwin.cpp,1.1,NONE htmlwin.h,1.1,NONE printing.cpp,1.1,NONE printing.h,1.1,NONE wxluawrap.i,1.1,NONE

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

Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5356/wxLua/bindings/wxwidgets

Modified Files:
	defsutil.i wx.rules 
Removed Files:
	README.txt htmlwin.cpp htmlwin.h printing.cpp printing.h 
	wxluawrap.i 
Log Message:
remove more dead files
add back univ platform for defsutils.i
cleanup wx.rules
add wxluaeditor, an embedded sample editor using wxSTEditor


--- wxluawrap.i DELETED ---

--- printing.cpp DELETED ---

--- htmlwin.h DELETED ---

Index: wx.rules
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx.rules,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wx.rules	19 Nov 2005 23:58:49 -0000	1.3
--- wx.rules	24 Nov 2005 06:38:17 -0000	1.4
***************
*** 1,30 ****
  -- rules to build wxLua binding for parts/debuggermsw
! wxidepath="../"
! --cdluapath=wxidepath.."/parts/cdlua/"
! interfacedir=wxidepath.."/bindings/wxwidgets"
  
! outputdir=wxidepath.."/modules/wxbind/src"
! outputheaderdir=wxidepath.."/modules/wxbind/include"
  
! hook_namespace="wx"
! hook_precmp_header="wx/wxprec.h"
! hook_binding_class=hook_namespace.."_Binding"
! hook_define_file=hook_namespace.."_define"
! hook_define_fn="GetDefineList_"..hook_namespace
! hook_object_file=hook_namespace.."_object"
! hook_object_fn="GetObjectList_"..hook_namespace
! hook_event_file=hook_namespace.."_event"
! hook_event_fn="GetEventList_"..hook_namespace
! hook_builtin_file=hook_namespace.."_builtin"
! hook_builtin_fn="GetBuiltinList_"..hook_namespace
! hook_class_file=hook_namespace.."_class"
! hook_class_fn="GetClassList_"..hook_namespace
! hook_header_file="wxbind/include/wxbind.h"
! override_file="override.hpp"
  
  -- generate comments into code
  comment = true
  
! -- list of interface files
  interfaceFileList = 
  {
--- 1,31 ----
  -- rules to build wxLua binding for parts/debuggermsw
! wxluapath="../"
  
! --cdluapath=wxluapath.."/parts/cdlua/" -- FIXME see genwxbind for this
  
! interfacedir    = wxluapath.."/bindings/wxwidgets"
! outputdir       = wxluapath.."/modules/wxbind/src"
! outputheaderdir = wxluapath.."/modules/wxbind/include"
! 
! hook_namespace     = "wx"                             -- lua namespace
! hook_precmp_header = "wx/wxprec.h"                    -- always #include this
! hook_binding_class = hook_namespace.."_Binding"       -- wxLuaBinding class
! hook_define_file   = hook_namespace.."_define"
! hook_define_fn     = "GetDefineList_"..hook_namespace
! hook_object_file   = hook_namespace.."_object"
! hook_object_fn     = "GetObjectList_"..hook_namespace
! hook_event_file    = hook_namespace.."_event"
! hook_event_fn      = "GetEventList_"..hook_namespace
! hook_builtin_file  = hook_namespace.."_builtin"
! hook_builtin_fn    = "GetBuiltinList_"..hook_namespace
! hook_class_file    = hook_namespace.."_class"
! hook_class_fn      = "GetClassList_"..hook_namespace
! hook_header_file   = "wxbind/include/wxbind.h"
! override_file      = "override.hpp"                   -- bindings to override
  
  -- generate comments into code
  comment = true
  
! -- list of interface files to use to make the bindings
  interfaceFileList = 
  {
***************
*** 79,91 ****
  }
  
! -- additional bind conditions
  conditions["DOXYGEN_INCLUDE"] = "defined(DOXYGEN_INCLUDE)"
- conditions["pmSUPPORT_OLD_FORMAT"] = "pmSUPPORT_OLD_FORMAT"
- 
- conditions["wxLUA_USE_CODEDRAGON_COMPONENT"] = "wxLUA_USE_CODEDRAGON_COMPONENT"
- conditions["wxLUA_USE_CODEDRAGON_DEBUGGER"] = "wxLUA_USE_CODEDRAGON_DEBUGGER"
- conditions["wxLUA_USE_CODEDRAGON_DEBUGGERMSW"] = "wxLUA_USE_CODEDRAGON_DEBUGGERMSW"
- conditions["wxLUA_USE_CODEDRAGON_EXEC"] = "wxLUA_USE_CODEDRAGON_EXEC"
- conditions["wxLUA_USE_CODEDRAGON_GUIDE"] = "wxLUA_USE_CODEDRAGON_GUIDE"
- conditions["wxLUA_USE_CODEDRAGON_IDE"] = "wxLUA_USE_CODEDRAGON_IDE"
- conditions["wxLUA_USE_CODEDRAGON_WIZARD"] = "wxLUA_USE_CODEDRAGON_WIZARD"
--- 80,83 ----
  }
  
! -- you can add additional conditions here
  conditions["DOXYGEN_INCLUDE"] = "defined(DOXYGEN_INCLUDE)"

Index: defsutil.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** defsutil.i	19 Nov 2005 07:08:39 -0000	1.5
--- defsutil.i	24 Nov 2005 06:38:17 -0000	1.6
***************
*** 37,41 ****
  %endenum
  
- // FIXME add wxProcess 
  %class %delete %encapsulate wxProcess, wxEvtHandler
      wxProcess(wxEvtHandler *parent = NULL, int nId = wxID_ANY)
--- 37,40 ----
***************
*** 139,143 ****
  %motif %define wxPlatformMotif
  %os2 %define wxPlatformOS2
! // %univ %define wxPlatformUniv // FIXME add this back
  %x11 %define wxPlatformX11
  %cocoa %define wxPlatformCocoa
--- 138,142 ----
  %motif %define wxPlatformMotif
  %os2 %define wxPlatformOS2
! %univ %define wxPlatformUniv
  %x11 %define wxPlatformX11
  %cocoa %define wxPlatformCocoa

--- htmlwin.cpp DELETED ---

--- README.txt DELETED ---

--- printing.h DELETED ---

[Wxlua-commit] wxLua/art play.xpm,NONE,1.1 stop.xpm,NONE,1.1

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

Update of /cvsroot/wxlua/wxLua/art
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5356/wxLua/art

Added Files:
	play.xpm stop.xpm 
Log Message:
remove more dead files
add back univ platform for defsutils.i
cleanup wx.rules
add wxluaeditor, an embedded sample editor using wxSTEditor


--- NEW FILE: play.xpm ---
/* XPM */
static char *play_xpm[]={
"16 16 2 1",
". c None",
"# c #000000",
"................",
"................",
"....###.........",
"....####........",
"....#####.......",
"....######......",
"....#######.....",
"....########....",
"....########....",
"....#######.....",
"....######......",
"....#####.......",
"....####........",
"....###.........",
"................",
"................"};

--- NEW FILE: stop.xpm ---
/* XPM */
static char *stop_xpm[]={
"16 16 3 1",
". c None",
"# c #000000",
"a c #585858",
"................",
"................",
"................",
"....########....",
"...#########a...",
"...#########a...",
"...#########a...",
"...#########a...",
"...#########a...",
"...#########a...",
"...#########a...",
"...#########a...",
"....aaaaaaaa....",
"................",
"................",
"................"};

[Wxlua-commit] wxLua/apps/wxluaedit/src - New directory

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

Update of /cvsroot/wxlua/wxLua/apps/wxluaedit/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5091/wxluaedit/src

Log Message:
Directory /cvsroot/wxlua/wxLua/apps/wxluaedit/src added to the repository

[Wxlua-commit] wxLua/apps/wxluaedit - New directory

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

Update of /cvsroot/wxlua/wxLua/apps/wxluaedit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5076/wxluaedit

Log Message:
Directory /cvsroot/wxlua/wxLua/apps/wxluaedit added to the repository

[Wxlua-commit] wxLua/bindings genwxbind.lua,1.5,1.6

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

Update of /cvsroot/wxlua/wxLua/bindings
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10852/wxLua/bindings

Modified Files:
	genwxbind.lua 
Log Message:
fix static class functions to work, but using %builtin


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** genwxbind.lua	20 Nov 2005 04:09:46 -0000	1.5
--- genwxbind.lua	24 Nov 2005 03:38:05 -0000	1.6
***************
*** 1,3 ****
! ----------------------------------------------------------------------------------
  -- Name:        genwxbind.lua
  -- Purpose:     This script generates wrapper files from the table interfaceFileList (see below)
--- 1,3 ----
! -------------------------------------------------------------------------------
  -- Name:        genwxbind.lua
  -- Purpose:     This script generates wrapper files from the table interfaceFileList (see below)
***************
*** 6,20 ****
  -- Copyright:   Ray Gilbert
  -- Licence:     wxWindows licence
! ----------------------------------------------------------------------------------
  -- code generated is compatible with wxWrapLua.lua, J Winwood's work from wxLua
  --
  -- There were a few shortcomings of the code generated by wxWrapLua
  -- * it generated 1 huge header file, which caused some compilers to barf
! -- * it generated an different wrapper file for each version and platform of wxWidgets
  --
  -- This generator creates
! -- * seperate c files for each interface file
  -- * each wrapper file uses c-preprocessor defines, and leaves it
! --   up to the compiler to add correct wrapper functions. This also haves
  --   the advantage of being able to distribute pre-generated wrapper interface files
  
--- 6,20 ----
  -- Copyright:   Ray Gilbert
  -- Licence:     wxWindows licence
! -------------------------------------------------------------------------------
  -- code generated is compatible with wxWrapLua.lua, J Winwood's work from wxLua
  --
  -- There were a few shortcomings of the code generated by wxWrapLua
  -- * it generated 1 huge header file, which caused some compilers to barf
! -- * it generated a different wrapper file for each version and platform of wxWidgets
  --
  -- This generator creates
! -- * seperate cpp files for each interface file
  -- * each wrapper file uses c-preprocessor defines, and leaves it
! --   up to the compiler to add correct wrapper functions. This also has
  --   the advantage of being able to distribute pre-generated wrapper interface files
  
***************
*** 92,127 ****
  
  function InitDataTypes()
!     -- well known datatypes
      dataTypes["void"]               = AllocDataType("void",               "builtin",   true)
-     dataTypes["int"]                = AllocDataType("int",                "builtin",   true)
-     dataTypes["char"]               = AllocDataType("char",               "builtin",   true)
-     dataTypes["long"]               = AllocDataType("long",               "builtin",   true)
      dataTypes["bool"]               = AllocDataType("bool",               "builtin",   true)
      dataTypes["BOOL"]               = AllocDataType("BOOL",               "builtin",   true)
      dataTypes["short"]              = AllocDataType("short",              "builtin",   true)
!     dataTypes["size_t"]             = AllocDataType("size_t",             "builtin",   true)
!     dataTypes["unsigned int"]       = AllocDataType("unsigned int",       "builtin",   true)
      dataTypes["unsigned char"]      = AllocDataType("unsigned char",      "builtin",   true)
      dataTypes["unsigned long"]      = AllocDataType("unsigned long",      "builtin",   true)
      dataTypes["unsigned short"]     = AllocDataType("unsigned short",     "builtin",   true)
      dataTypes["wchar_t"]            = AllocDataType("wchar_t",            "builtin",   true)
-     dataTypes["double"]             = AllocDataType("double",             "builtin",   true)
      dataTypes["float"]              = AllocDataType("float",              "builtin",   true)
      dataTypes["double"]             = AllocDataType("double",             "builtin",   true)
      dataTypes["time_t"]             = AllocDataType("time_t",             "builtin",   true)
! 
!     dataTypes["wxString"]           = AllocDataType("wxString",           "wx2lua",    true)
!     dataTypes["wxCoord"]            = AllocDataType("wxCoord",            "wxtypedef", true)
      dataTypes["wxDouble"]           = AllocDataType("wxDouble",           "wxtypedef", true)
      dataTypes["WXTYPE"]             = AllocDataType("WXTYPE",             "wxtypedef", true)
      dataTypes["wxWindowID"]         = AllocDataType("wxWindowID",         "wxtypedef", true)
      dataTypes["wxEventType"]        = AllocDataType("wxEventType",        "wxtypedef", true)
      dataTypes["wxSocketEventFlags"] = AllocDataType("wxSocketEventFlags", "wxtypedef", true)
-     dataTypes["wxUint32"]           = AllocDataType("wxUint32",           "wxtypedef", true)
-     dataTypes["wxInt32"]            = AllocDataType("wxInt32",            "wxtypedef", true)
      dataTypes["wxFileOffset"]       = AllocDataType("wxFileOffset",       "wxtypedef", true)
-     dataTypes["wxByte"]             = AllocDataType("wxByte",             "wxtypedef", true)
-     dataTypes["wxChar"]             = AllocDataType("wxChar",             "wxtypedef", true)
      dataTypes["wxStructStat"]       = AllocDataType("wxStructStat",       "wxtypedef", true)
      dataTypes["lua_State"]          = AllocDataType("lua_State",          "wxtypedef", false)
      -- win32
--- 92,136 ----
  
  function InitDataTypes()
!     -- Standard C data types
      dataTypes["void"]               = AllocDataType("void",               "builtin",   true)
      dataTypes["bool"]               = AllocDataType("bool",               "builtin",   true)
      dataTypes["BOOL"]               = AllocDataType("BOOL",               "builtin",   true)
      dataTypes["short"]              = AllocDataType("short",              "builtin",   true)
!     dataTypes["int"]                = AllocDataType("int",                "builtin",   true)
!     dataTypes["char"]               = AllocDataType("char",               "builtin",   true)
!     dataTypes["long"]               = AllocDataType("long",               "builtin",   true)
      dataTypes["unsigned char"]      = AllocDataType("unsigned char",      "builtin",   true)
+     dataTypes["unsigned int"]       = AllocDataType("unsigned int",       "builtin",   true)
      dataTypes["unsigned long"]      = AllocDataType("unsigned long",      "builtin",   true)
      dataTypes["unsigned short"]     = AllocDataType("unsigned short",     "builtin",   true)
      dataTypes["wchar_t"]            = AllocDataType("wchar_t",            "builtin",   true)
      dataTypes["float"]              = AllocDataType("float",              "builtin",   true)
      dataTypes["double"]             = AllocDataType("double",             "builtin",   true)
+     dataTypes["size_t"]             = AllocDataType("size_t",             "builtin",   true)
      dataTypes["time_t"]             = AllocDataType("time_t",             "builtin",   true)
!     -- wxWidgets defined data types
!     dataTypes["wxByte"]             = AllocDataType("wxByte",             "wxtypedef", true)
!     dataTypes["wxChar"]             = AllocDataType("wxChar",             "wxtypedef", true)
!     dataTypes["wxWord"]             = AllocDataType("wxWord",             "wxtypedef", true)
!     dataTypes["wxInt8"]             = AllocDataType("wxInt8",             "wxtypedef", true)
!     dataTypes["wxUint8"]            = AllocDataType("wxUint8",            "wxtypedef", true)
!     dataTypes["wxInt16"]            = AllocDataType("wxInt16",            "wxtypedef", true)
!     dataTypes["wxUint16"]           = AllocDataType("wxUint16",           "wxtypedef", true)
!     dataTypes["wxInt32"]            = AllocDataType("wxInt32",            "wxtypedef", true)
!     dataTypes["wxUint32"]           = AllocDataType("wxUint32",           "wxtypedef", true)
!     dataTypes["wxInt64"]            = AllocDataType("wxInt64",            "wxtypedef", true)
!     dataTypes["wxUint64"]           = AllocDataType("wxUint64",           "wxtypedef", true)
!     dataTypes["wxFloat32"]          = AllocDataType("wxFloat32",          "wxtypedef", true)
!     dataTypes["wxFloat64"]          = AllocDataType("wxFloat64",          "wxtypedef", true)
      dataTypes["wxDouble"]           = AllocDataType("wxDouble",           "wxtypedef", true)
+     dataTypes["wxCoord"]            = AllocDataType("wxCoord",            "wxtypedef", true)
+     dataTypes["wxString"]           = AllocDataType("wxString",           "wx2lua",    true)
      dataTypes["WXTYPE"]             = AllocDataType("WXTYPE",             "wxtypedef", true)
      dataTypes["wxWindowID"]         = AllocDataType("wxWindowID",         "wxtypedef", true)
      dataTypes["wxEventType"]        = AllocDataType("wxEventType",        "wxtypedef", true)
      dataTypes["wxSocketEventFlags"] = AllocDataType("wxSocketEventFlags", "wxtypedef", true)
      dataTypes["wxFileOffset"]       = AllocDataType("wxFileOffset",       "wxtypedef", true)
      dataTypes["wxStructStat"]       = AllocDataType("wxStructStat",       "wxtypedef", true)
+     -- lua data type
      dataTypes["lua_State"]          = AllocDataType("lua_State",          "wxtypedef", false)
      -- win32
***************
*** 134,144 ****
      dataTypes["LPDWORD"]            = AllocDataType("LPDWORD",            "builtin",   true)
  
!  --   dataTypes["cdPropertyItemList"] = AllocDataType("cdPropertyItemList", "wxtypedef", false)
!  --   dataTypes["cdPropertyTemplateList"] = AllocDataType("cdPropertyTemplateList", "wxtypedef", false)
!  --   dataTypes["cdPropertyMemberList"] = AllocDataType("cdPropertyMemberList", "wxtypedef", false)
! 
      dataTypeAttribs["unsigned"] = true
      dataTypeAttribs["const"]    = true
- 
      functionAttribs["static"]   = true
      functionAttribs["virtual"]  = true
--- 143,149 ----
      dataTypes["LPDWORD"]            = AllocDataType("LPDWORD",            "builtin",   true)
  
!     -- data type attributes that can precede a data type
      dataTypeAttribs["unsigned"] = true
      dataTypeAttribs["const"]    = true
      functionAttribs["static"]   = true
      functionAttribs["virtual"]  = true
***************
*** 165,169 ****
      local typeData = SplitString(typedefinition, { " ", "&", "*" })
  
!     for i=1, table.getn(typeData) do
          if dataTypes[typeData[i]] then
              return typeData[i]
--- 170,174 ----
      local typeData = SplitString(typedefinition, { " ", "&", "*" })
  
!     for i = 1, table.getn(typeData) do
          if dataTypes[typeData[i]] then
              return typeData[i]
***************
*** 182,186 ****
  
      local typeData = SplitString(decl, { "[]", " ", "&", "*", "(", ")" }, { "[]", "&", "*", "(", ")" })
!     for i=1, table.getn(typeData) do
          if typeData[i] == "(" then
              cast = cast + 1
--- 187,191 ----
  
      local typeData = SplitString(decl, { "[]", " ", "&", "*", "(", ")" }, { "[]", "&", "*", "(", ")" })
!     for i = 1, table.getn(typeData) do
          if typeData[i] == "(" then
              cast = cast + 1
***************
*** 190,194 ****
              if isDataTypeAttrib(typeData[i]) then
                  attrib[typeData[i]] = typeData[i]
!             elseif typeData[i] == "[]" or typeData[i] == "*" or typeData[i] == "&" then
                  table.insert(ptr, typeData[i])
              elseif dataTypes[typeData[i]] then
--- 195,199 ----
              if isDataTypeAttrib(typeData[i]) then
                  attrib[typeData[i]] = typeData[i]
!             elseif (typeData[i] == "[]") or (typeData[i] == "*") or (typeData[i] == "&") then
                  table.insert(ptr, typeData[i])
              elseif dataTypes[typeData[i]] then
***************
*** 220,224 ****
          local datatype = nil
          for idx, attrib in attribs do
!             if idx ~= nil and idx ~= "n" and attrib then
                  if datatype then
                      datatype = datatype.." "..attrib
--- 225,229 ----
          local datatype = nil
          for idx, attrib in attribs do
!             if (idx ~= nil) and (idx ~= "n") and attrib then
                  if datatype then
                      datatype = datatype.." "..attrib
***************
*** 261,265 ****
      local tlstype = nil
      for idx, attrib in attribs do
!         if idx ~= nil and idx ~= "n" and attrib then
              if tlstype then
                  tlstype = tlstype.." "..attrib
--- 266,270 ----
      local tlstype = nil
      for idx, attrib in attribs do
!         if (idx ~= nil) and (idx ~= "n") and attrib then
              if tlstype then
                  tlstype = tlstype.." "..attrib
***************
*** 442,446 ****
          condition = conditionStack[1]
      else
!         for i=1, conditionStackCount do
              if not condition then
                  condition = "("..conditionStack[i]..")"
--- 447,451 ----
          condition = conditionStack[1]
      else
!         for i = 1, conditionStackCount do
              if not condition then
                  condition = "("..conditionStack[i]..")"
***************
*** 478,497 ****
      conditions["%wxchkver26"] = "wxCHECK_VERSION(2,6,0)"
      conditions["%wxchkver27"] = "wxCHECK_VERSION(2,7,0)"
      conditions["%wxcompat20"] = "WXWIN_COMPATIBILITY_2"
      conditions["%wxcompat22"] = "WXWIN_COMPATIBILITY_2_2"
      conditions["%wxcompat24"] = "WXWIN_COMPATIBILITY_2_4"
      conditions["%wxcompat26"] = "WXWIN_COMPATIBILITY_2_6"
! 
      -- wxWidgets platform checks
!     conditions["%win"]   = "defined(__WXMSW__)"
!     conditions["%msw"]   = "defined(__WXMSW__)"
!     conditions["%gtk"]   = "defined(__WXGTK__)"
!     conditions["%mac"]   = "defined(__WXMAC__)"
!     conditions["%mgl"]   = "defined(__WXMGL__)"
!     conditions["%motif"] = "defined(__WXMOTIF__)"
!     conditions["%univ"]  = "defined(__WXMSW__)"
!     conditions["%x11"]   = "defined(__WXX11__)"
!     conditions["%cocoa"] = "defined(__WXCOCOA__)"
!     conditions["%os2"]   = "defined(__WXPM__)"
  
      -- wxUSE_ conditions
--- 483,506 ----
      conditions["%wxchkver26"] = "wxCHECK_VERSION(2,6,0)"
      conditions["%wxchkver27"] = "wxCHECK_VERSION(2,7,0)"
+     conditions["%wxchkver28"] = "wxCHECK_VERSION(2,8,0)"
+     -- wxWidgets version compatibility checks
      conditions["%wxcompat20"] = "WXWIN_COMPATIBILITY_2"
      conditions["%wxcompat22"] = "WXWIN_COMPATIBILITY_2_2"
      conditions["%wxcompat24"] = "WXWIN_COMPATIBILITY_2_4"
      conditions["%wxcompat26"] = "WXWIN_COMPATIBILITY_2_6"
!     conditions["%wxcompat28"] = "WXWIN_COMPATIBILITY_2_8"
      -- wxWidgets platform checks
!     conditions["%win"]        = "defined(__WXMSW__)"
!     conditions["%msw"]        = "defined(__WXMSW__)"
!     conditions["%gtk"]        = "defined(__WXGTK__)"
!     conditions["%mac"]        = "defined(__WXMAC__)"
!     conditions["%mgl"]        = "defined(__WXMGL__)"
!     conditions["%motif"]      = "defined(__WXMOTIF__)"
!     conditions["%univ"]       = "defined(__WXUNIVERSAL__)"
!     conditions["%x11"]        = "defined(__WXX11__)"
!     conditions["%cocoa"]      = "defined(__WXCOCOA__)"
!     conditions["%os2"]        = "defined(__WXPM__)"
!     conditions["%palm"]       = "defined(__WXPALMOS__)"
!     conditions["%wince"]      = "defined(__WXWINCE__)"
  
      -- wxUSE_ conditions
***************
*** 673,677 ****
      conditions["wxUSE_ZLIB"]                    = "wxUSE_ZLIB"
  
!      -- wxLUA_USE_ conditions
      conditions["wxLUA_USE_CODEDRAGON"]           = "wxLUA_USE_CODEDRAGON"
      conditions["wxLUA_USE_FL"]                   = "wxLUA_USE_FL"
--- 682,686 ----
      conditions["wxUSE_ZLIB"]                    = "wxUSE_ZLIB"
  
!     -- wxLUA_USE_ conditions
      conditions["wxLUA_USE_CODEDRAGON"]           = "wxLUA_USE_CODEDRAGON"
      conditions["wxLUA_USE_FL"]                   = "wxLUA_USE_FL"
***************
*** 785,789 ****
      conditions["wxLUA_USE_wxXMLResource"]        = "wxLUA_USE_wxXMLResource"
  
- 
      -- operators
      conditionOperators["|"]  = "||"
--- 794,797 ----
***************
*** 829,835 ****
  end
  
! -- Split string
! --
! -- String tokenizing function
  --
  -- Params:
--- 837,841 ----
  end
  
! -- SplitString - String tokenizing function
  --
  -- Params:
***************
*** 867,873 ****
                  end
              else
!                     if string.sub(val, 1, 1) == "\"" then
!                         inStringLiteral = true
!                     end
              end
          end
--- 873,879 ----
                  end
              else
!                 if string.sub(val, 1, 1) == "\"" then
!                     inStringLiteral = true
!                 end
              end
          end
***************
*** 875,879 ****
          if not inStringLiteral then
              -- delimiter can be an table of strings
!             for d=1, table.getn(delimiter) do
                  if string.sub(val, 1, string.len(delimiter[d])) == delimiter[d] then
                      delim = delimiter[d]
--- 881,885 ----
          if not inStringLiteral then
              -- delimiter can be an table of strings
!             for d = 1, table.getn(delimiter) do
                  if string.sub(val, 1, string.len(delimiter[d])) == delimiter[d] then
                      delim = delimiter[d]
***************
*** 884,888 ****
              -- keep delimiter in list
              if delim and keep then
!                 for d=1, table.getn(keep) do
                      if delim == keep[d] then
                          keepDelim = true
--- 890,894 ----
              -- keep delimiter in list
              if delim and keep then
!                 for d = 1, table.getn(keep) do
                      if delim == keep[d] then
                          keepDelim = true
***************
*** 1038,1042 ****
          if filename then
              local interfaceFileData = readInterfaceFile(filename)
- 
              BuildDataTypeTable(interfaceFileData)
  
--- 1044,1047 ----
***************
*** 1070,1074 ****
  function writeWrapperFiles(interfaceList)
  
!     -- generatelanguage binding, binding is store in objectList
      for idx = 1, table.getn(interfaceList) do
           local interface = interfaceList[idx]
--- 1075,1079 ----
  function writeWrapperFiles(interfaceList)
  
!     -- generatelanguage binding, binding is stored in objectList
      for idx = 1, table.getn(interfaceList) do
           local interface = interfaceList[idx]
***************
*** 1182,1186 ****
  
      local lineCount = table.getn(interfaceData)
!     for l=1, lineCount do
          -- get lineData
          local line = interfaceData[l]
--- 1187,1191 ----
  
      local lineCount = table.getn(interfaceData)
!     for l = 1, lineCount do
          -- get lineData
          local line = interfaceData[l]
***************
*** 1195,1199 ****
  
          local tagCount = table.getn(lineTags)
!         for t=1, tagCount do
              local tag = lineTags[t]
  
--- 1200,1204 ----
  
          local tagCount = table.getn(lineTags)
!         for t = 1, tagCount do
              local tag = lineTags[t]
  
***************
*** 1286,1290 ****
  
      local lineCount = table.getn(interfaceData)
!     for l=1, lineCount do
          -- get lineData
          local line = interfaceData[l]
--- 1291,1295 ----
  
      local lineCount = table.getn(interfaceData)
!     for l = 1, lineCount do
          -- get lineData
          local line = interfaceData[l]
***************
*** 1326,1330 ****
  
          local tagCount = table.getn(lineTags)
!         for t=1, tagCount do
              local tag = lineTags[t]
  
--- 1331,1335 ----
  
          local tagCount = table.getn(lineTags)
!         for t = 1, tagCount do
              local tag = lineTags[t]
  
***************
*** 1555,1559 ****
                  end
              elseif not parseState.IsBlockComment then
!                 if tag == "!" or (lineState.DefType == "blockcondition" or lineState.InLineConditionIf) and conditionOperators[tag] then
                      if not lineState.Condition and (conditionOperators[tag] ~= "!") then
                          print("Error: Unexpected Conditional Operator "..tag..". File: "..line.File..":(line "..line.LineNumber..")\n")
--- 1560,1564 ----
                  end
              elseif not parseState.IsBlockComment then
!                 if (tag == "!") or ((lineState.DefType == "blockcondition") or lineState.InLineConditionIf) and conditionOperators[tag] then
                      if not lineState.Condition and (conditionOperators[tag] ~= "!") then
                          print("Error: Unexpected Conditional Operator "..tag..". File: "..line.File..":(line "..line.LineNumber..")\n")
***************
*** 1661,1665 ****
                                      lineState.DefType = "method"
                                      lineState.Action = "method"
- 
                                      lineState.ActionMandatory = true
  
--- 1666,1669 ----
***************
*** 1673,1693 ****
                                      lineState.DefType = "method"
                                      lineState.Action = "method"
- 
                                      lineState.ActionMandatory = true
  
                                  elseif tag == "virtual" then
                                      lineState.IsVirtualFunction = true
- 
                                      lineState.DefType = "method"
                                      lineState.Action = "method"
- 
                                      lineState.ActionMandatory = true
  
                                  elseif tag == "static" then
                                      lineState.IsStaticFunction = true
- 
                                      lineState.DefType = "method"
                                      lineState.Action = "method"
- 
                                      lineState.ActionMandatory = true
  
--- 1677,1692 ----
***************
*** 1697,1701 ****
                                          lineState.DataType = parseState.ObjectStack[1].Name
                                          lineState.DataTypeWithAttrib = lineState.DataType
- 
                                          lineState.DefType = "method"
                                          lineState.Action = "method"
--- 1696,1699 ----
***************
*** 1732,1738 ****
                              parseState.ObjectStack[1].Name = tag
  
-                             lineState.DataType = tag
                              enumType = tag
! 
                              lineState.Action = nil
                              lineState.ActionMandatory = false
--- 1730,1735 ----
                              parseState.ObjectStack[1].Name = tag
  
                              enumType = tag
!                             lineState.DataType = tag
                              lineState.Action = nil
                              lineState.ActionMandatory = false
***************
*** 1803,1809 ****
                              lineState.Name = tag
  
-                             --local member = AllocMember(lineState)
-                             --table.insert(parseState.ObjectStack[1].Members, member)
- 
                              lineState.Action = nil
                              lineState.ActionMandatory = false
--- 1800,1803 ----
***************
*** 1836,1840 ****
                                  lineState.ActionMandatory = true
  
!                             elseif tag == "*" or tag == "&" or tag == "[]" then
                                  table.insert(lineState.DataTypePointer, tag)
  
--- 1830,1834 ----
                                  lineState.ActionMandatory = true
  
!                             elseif (tag == "*") or (tag == "&") or (tag == "[]") then
                                  table.insert(lineState.DataTypePointer, tag)
  
***************
*** 1851,1860 ****
                                  end
  
- --                                local member= AllocMember(lineState)
- --                                table.insert(parseState.ObjectStack[1].Members, member)
- 
                                  lineState.Action = nil
                                  lineState.ActionMandatory = false
- 
                              end
  
--- 1845,1850 ----
***************
*** 1886,1890 ****
                                  lineState.ActionMandatory = true
  
!                             elseif tag == "*" or tag == "&" then
                                  table.insert(lineState.DataTypePointer, tag)
  
--- 1876,1880 ----
                                  lineState.ActionMandatory = true
  
!                             elseif (tag == "*") or (tag == "&") then
                                  table.insert(lineState.DataTypePointer, tag)
  
***************
*** 1944,1950 ****
                                  end
  
- --                                local member= AllocMember(lineState)
- --                                table.insert(parseState.ObjectStack[1].Members, member)
- 
                                  lineState.Action = "methodbracket"
                                  lineState.ActionMandatory = true
--- 1934,1937 ----
***************
*** 2237,2241 ****
      end
  
!     -- pop builtin (globals) parseObject
      table.insert(objectList, 1, parseState.ObjectStack[1])
      table.remove(parseState.ObjectStack, 1)
--- 2224,2228 ----
      end
  
!     -- pop builtin (globals) parseObject that was put in first
      table.insert(objectList, 1, parseState.ObjectStack[1])
      table.remove(parseState.ObjectStack, 1)
***************
*** 2243,2247 ****
      if table.getn(parseState.ObjectStack) ~= 0 then
          print("parseState.ObjectStack should be empty, has "..table.getn(parseState.ObjectStack).." items left.")
!         DumpTable(parseState.ObjectStack)
      end
  
--- 2230,2234 ----
      if table.getn(parseState.ObjectStack) ~= 0 then
          print("parseState.ObjectStack should be empty, has "..table.getn(parseState.ObjectStack).." items left.")
!         DumpTable(parseState.ObjectStack, "parseState.ObjectStack")
      end
  
***************
*** 2253,2257 ****
  
      local var = split[1]
!     for i=2, table.getn(split) do
          var = var.."_"..split[i]
      end
--- 2240,2244 ----
  
      local var = split[1]
!     for i = 2, table.getn(split) do
          var = var.."_"..split[i]
      end
***************
*** 2285,2292 ****
      local parseObjectCount = table.getn(interface.objectData)
  
!     for o=1, parseObjectCount do
          local parseObject = interface.objectData[o]
  
!         -- //////////////////////////////////////////////////////////////////////////////////
          -- de-duplicates include references
          if parseObject.DefType == "include" then
--- 2272,2279 ----
      local parseObjectCount = table.getn(interface.objectData)
  
!     for o = 1, parseObjectCount do
          local parseObject = interface.objectData[o]
  
!         -- ///////////////////////////////////////////////////////////////////
          -- de-duplicates include references
          if parseObject.DefType == "include" then
***************
*** 2314,2321 ****
      end
  
!     for o=1, parseObjectCount do
          local parseObject = interface.objectData[o]
  
!         -- //////////////////////////////////////////////////////////////////////////////////
          -- encapsulate non-wxObject objects with a tracked wxObject
          if parseObject.Encapsulate then
--- 2301,2308 ----
      end
  
!     for o = 1, parseObjectCount do
          local parseObject = interface.objectData[o]
  
!         -- ///////////////////////////////////////////////////////////////////
          -- encapsulate non-wxObject objects with a tracked wxObject
          if parseObject.Encapsulate then
***************
*** 2336,2345 ****
          -- parseObject member binding
          local memberCount = table.getn(parseObject.Members)
!         for m=1, memberCount do
              local member = parseObject.Members[m]
  
              local fullcondition = AddCondition(member.Condition, member.ExtraCondition)
  
!             -- //////////////////////////////////////////////////////////////////////////////////
              -- property binding
              if member.DefType == "property" then
--- 2323,2332 ----
          -- parseObject member binding
          local memberCount = table.getn(parseObject.Members)
!         for m = 1, memberCount do
              local member = parseObject.Members[m]
  
              local fullcondition = AddCondition(member.Condition, member.ExtraCondition)
  
!             -- ///////////////////////////////////////////////////////////////
              -- property binding
              if member.DefType == "property" then
***************
*** 3016,3019 ****
--- 3003,3007 ----
                      table.insert(codeList, "// "..interface.lineData[member.LineNumber].Line.."\n")
                  end
+                 
                  table.insert(codeList, "static int LUACALL "..funcName.."(lua_State *L)\n{\n")
  
***************
*** 3460,3464 ****
      table.insert(fileData, "\n\n")
  
!     table.insert(fileData, "// binds "..hook_namespace.." to cdlua\n")
      table.insert(fileData, "bool bind_"..hook_namespace.."(lua_State* L);\n")
      table.insert(fileData, "\n\n")
--- 3448,3452 ----
      table.insert(fileData, "\n\n")
  
!     table.insert(fileData, "// binds "..hook_namespace.." to wxLua\n")
      table.insert(fileData, "bool bind_"..hook_namespace.."(lua_State* L);\n")
      table.insert(fileData, "\n\n")
***************
*** 3471,3481 ****
  
  
!     -- ///////////////////////////////////////////////////////////////////////////////////////////////////
      --
      -- Object Include List
      --
!     -- /////////////////////////////////////////////////////////////////////////////////////////////////
      for condition, classIncludeBindingList in classIncludeBindingTable do
!         if condition ~= nil and condition ~= "n" and condition ~= "" and classIncludeBindingList then
              if condition ~= "1" then
                  table.insert(fileData, "\n#if "..condition.."\n")
--- 3459,3469 ----
  
  
!     -- ///////////////////////////////////////////////////////////////////////
      --
      -- Object Include List
      --
!     -- ///////////////////////////////////////////////////////////////////////
      for condition, classIncludeBindingList in classIncludeBindingTable do
!         if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and classIncludeBindingList then
              if condition ~= "1" then
                  table.insert(fileData, "\n#if "..condition.."\n")
***************
*** 3494,3505 ****
      table.insert(fileData, "\n")
  
!     -- ///////////////////////////////////////////////////////////////////////////////////////////////////
      --
      -- Class Tag Declaration
      --
!     -- /////////////////////////////////////////////////////////////////////////////////////////////////
      table.insert(fileData, "// Lua Tag Method Values for each Class\n")
      for condition, classTagBindingList in classTagBindingTable do
!         if condition ~= nil and condition ~= "n" and condition ~= "" and classTagBindingList then
              if condition ~= "1" then
                  table.insert(fileData, "\n#if "..condition.."\n")
--- 3482,3493 ----
      table.insert(fileData, "\n")
  
!     -- ///////////////////////////////////////////////////////////////////////
      --
      -- Class Tag Declaration
      --
!     -- ///////////////////////////////////////////////////////////////////////
      table.insert(fileData, "// Lua Tag Method Values for each Class\n")
      for condition, classTagBindingList in classTagBindingTable do
!         if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and classTagBindingList then
              if condition ~= "1" then
                  table.insert(fileData, "\n#if "..condition.."\n")
***************
*** 3518,3529 ****
      table.insert(fileData, "\n\n")
  
!     -- ///////////////////////////////////////////////////////////////////////////////////////////////////
      --
      -- Class Method Table Declaration
      --
!     -- /////////////////////////////////////////////////////////////////////////////////////////////////
      table.insert(fileData, "// Method Table\n")
      for condition, classTagBindingList in classTagBindingTable do
!         if condition ~= nil and condition ~= "n" and condition ~= "" and classTagBindingList then
              if condition ~= "1" then
                  table.insert(fileData, "\n#if "..condition.."\n")
--- 3506,3517 ----
      table.insert(fileData, "\n\n")
  
!     -- ///////////////////////////////////////////////////////////////////////
      --
      -- Class Method Table Declaration
      --
!     -- ///////////////////////////////////////////////////////////////////////
      table.insert(fileData, "// Method Table\n")
      for condition, classTagBindingList in classTagBindingTable do
!         if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and classTagBindingList then
              if condition ~= "1" then
                  table.insert(fileData, "\n#if "..condition.."\n")
***************
*** 3549,3553 ****
      -- /////////////////////////////////////////////////////////////////////////////////////////////////
      for condition, encapsulationBindingList in encapsulationBindingTable do
!         if condition ~= nil and condition ~= "n" and condition ~= "" and encapsulationBindingList then
              if condition ~= "1" then
                  table.insert(fileData, "\n#if "..condition.."\n")
--- 3537,3541 ----
      -- /////////////////////////////////////////////////////////////////////////////////////////////////
      for condition, encapsulationBindingList in encapsulationBindingTable do
!         if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and encapsulationBindingList then
              if condition ~= "1" then
                  table.insert(fileData, "\n#if "..condition.."\n")
***************
*** 3567,3571 ****
  
      table.insert(fileData, "\n\n")
- 
      table.insert(fileData, "#endif // __HOOK_WXLUA_"..hook_namespace.."_H__\n\n")
  
--- 3555,3558 ----
***************
*** 3841,3847 ****
  end
  
! --------------------------------------------------------------------------
  -- Write GetObjectList Hook File
! --------------------------------------------------------------------------
  function generateHookObjectFileTable()
      local fileData = {}
--- 3828,3834 ----
  end
  
! ------------------------------------------------------------------------------
  -- Write GetObjectList Hook File
! ------------------------------------------------------------------------------
  function generateHookObjectFileTable()
      local fileData = {}
***************
*** 3879,3887 ****
      table.insert(fileData, "\n")
  
!     -- ///////////////////////////////////////////////////////////////////////////////////////////////////
      --
      -- GetObjectList
      --
!     -- /////////////////////////////////////////////////////////////////////////////////////////////////
      table.insert(fileData, "WXLUAOBJECT* "..hook_object_fn.."(size_t &count)\n{\n")
      table.insert(fileData, "    static WXLUAOBJECT objectList[] =\n    {\n")
--- 3866,3874 ----
      table.insert(fileData, "\n")
  
!     -- ///////////////////////////////////////////////////////////////////////
      --
      -- GetObjectList
      --
!     -- ///////////////////////////////////////////////////////////////////////
      table.insert(fileData, "WXLUAOBJECT* "..hook_object_fn.."(size_t &count)\n{\n")
      table.insert(fileData, "    static WXLUAOBJECT objectList[] =\n    {\n")
***************
*** 3928,3934 ****
  end
  
! --------------------------------------------------------------------------
  -- Write GetEventList Hook File
! --------------------------------------------------------------------------
  function generateHookEventFileTable()
      local fileData = {}
--- 3915,3921 ----
  end
  
! ------------------------------------------------------------------------------
  -- Write GetEventList Hook File
! ------------------------------------------------------------------------------
  function generateHookEventFileTable()
      local fileData = {}
***************
*** 3965,3973 ****
      table.insert(fileData, "\n\n")
  
!     -- ///////////////////////////////////////////////////////////////////////////////////////////////////
      --
      -- GetEventList
      --
!     -- /////////////////////////////////////////////////////////////////////////////////////////////////
      table.insert(fileData, "WXLUAEVENT* "..hook_event_fn.."(size_t &count)\n{\n")
      table.insert(fileData, "    static WXLUAEVENT eventList[] =\n    {\n")
--- 3952,3960 ----
      table.insert(fileData, "\n\n")
  
!     -- ///////////////////////////////////////////////////////////////////////
      --
      -- GetEventList
      --
!     -- ///////////////////////////////////////////////////////////////////////
      table.insert(fileData, "WXLUAEVENT* "..hook_event_fn.."(size_t &count)\n{\n")
      table.insert(fileData, "    static WXLUAEVENT eventList[] =\n    {\n")
***************
*** 3998,4004 ****
  end
  
! --------------------------------------------------------------------------
  -- Write GetBuiltinList Hook File
! --------------------------------------------------------------------------
  function generateHookBuiltinFileTable()
      local fileData = {}
--- 3985,3991 ----
  end
  
! ------------------------------------------------------------------------------
  -- Write GetBuiltinList Hook File
! ------------------------------------------------------------------------------
  function generateHookBuiltinFileTable()
      local fileData = {}
***************
*** 4064,4072 ****
      end
  
!     -- ///////////////////////////////////////////////////////////////////////////////////////////////////
      --
      -- GetBuiltinList
      --
!     -- /////////////////////////////////////////////////////////////////////////////////////////////////
      table.insert(fileData, "WXLUAMETHOD* "..hook_builtin_fn.."(size_t &count)\n{\n")
      table.insert(fileData, "    static WXLUAMETHOD builtinList[] =\n    {\n")
--- 4051,4059 ----
      end
  
!     -- ///////////////////////////////////////////////////////////////////////
      --
      -- GetBuiltinList
      --
!     -- ///////////////////////////////////////////////////////////////////////
      table.insert(fileData, "WXLUAMETHOD* "..hook_builtin_fn.."(size_t &count)\n{\n")
      table.insert(fileData, "    static WXLUAMETHOD builtinList[] =\n    {\n")
***************
*** 4393,4397 ****
      InitKeywords()
  
! --    BuildConditionsTable();
      InitDataTypes()
  
--- 4380,4384 ----
      InitKeywords()
  
! --    BuildConditionsTable()
      InitDataTypes()
  

[Wxlua-commit] wxLua/bindings/wxwidgets appframe.i,1.3,1.4 datetime.i,1.3,1.4

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

Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10852/wxLua/bindings/wxwidgets

Modified Files:
	appframe.i datetime.i 
Log Message:
fix static class functions to work, but using %builtin


Index: appframe.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** appframe.i	17 Nov 2005 05:51:20 -0000	1.3
--- appframe.i	24 Nov 2005 03:38:05 -0000	1.4
***************
*** 19,25 ****
  %endif
  
! %class wxApp, wxEvtHandler
!     %builtin wxApp* wxGetBaseApp()
  
      %wxchkver22&!%wxchkver25|%wxcompat24 virtual wxLog* CreateLogTarget()
      void Dispatch()
--- 19,25 ----
  %endif
  
! %builtin wxApp* wxGetBaseApp()
  
+ %class wxApp, wxEvtHandler
      %wxchkver22&!%wxchkver25|%wxcompat24 virtual wxLog* CreateLogTarget()
      void Dispatch()

Index: datetime.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** datetime.i	17 Nov 2005 05:51:20 -0000	1.3
--- datetime.i	24 Nov 2005 03:38:05 -0000	1.4
***************
*** 212,228 ****
  %include "wx/datetime.h"
  
  %class %delete %noclassinfo %encapsulate wxTimeSpan
      wxTimeSpan()
-     %builtin %rename wxTimeSpan_Seconds wxTimeSpan wxTimeSpan::Seconds(long sec)
-     %builtin %rename wxTimeSpan_Second  wxTimeSpan wxTimeSpan::Second()
-     %builtin %rename wxTimeSpan_Minutes wxTimeSpan wxTimeSpan::Minutes(long min)
-     %builtin %rename wxTimeSpan_Minute  wxTimeSpan wxTimeSpan::Minute()
-     %builtin %rename wxTimeSpan_Hours   wxTimeSpan wxTimeSpan::Hours(long hours)
-     %builtin %rename wxTimeSpan_Hour    wxTimeSpan wxTimeSpan::Hour()
-     %builtin %rename wxTimeSpan_Days    wxTimeSpan wxTimeSpan::Days(long days)
-     %builtin %rename wxTimeSpan_Day     wxTimeSpan wxTimeSpan::Day()
-     %builtin %rename wxTimeSpan_Weeks   wxTimeSpan wxTimeSpan::Weeks(long days)
-     %builtin %rename wxTimeSpan_Week    wxTimeSpan wxTimeSpan::Week()
- 
      %constructor wxTimeSpanHMS(long hours, long minutes = 0, long seconds = 0, long milliseconds = 0)
      wxTimeSpan Add(const wxTimeSpan& diff) const
--- 212,228 ----
  %include "wx/datetime.h"
  
+ %builtin %rename wxTimeSpan_Seconds wxTimeSpan wxTimeSpan::Seconds(long sec)
+ %builtin %rename wxTimeSpan_Second  wxTimeSpan wxTimeSpan::Second()
+ %builtin %rename wxTimeSpan_Minutes wxTimeSpan wxTimeSpan::Minutes(long min)
+ %builtin %rename wxTimeSpan_Minute  wxTimeSpan wxTimeSpan::Minute()
+ %builtin %rename wxTimeSpan_Hours   wxTimeSpan wxTimeSpan::Hours(long hours)
+ %builtin %rename wxTimeSpan_Hour    wxTimeSpan wxTimeSpan::Hour()
+ %builtin %rename wxTimeSpan_Days    wxTimeSpan wxTimeSpan::Days(long days)
+ %builtin %rename wxTimeSpan_Day     wxTimeSpan wxTimeSpan::Day()
+ %builtin %rename wxTimeSpan_Weeks   wxTimeSpan wxTimeSpan::Weeks(long days)
+ %builtin %rename wxTimeSpan_Week    wxTimeSpan wxTimeSpan::Week()
+ 
  %class %delete %noclassinfo %encapsulate wxTimeSpan
      wxTimeSpan()
      %constructor wxTimeSpanHMS(long hours, long minutes = 0, long seconds = 0, long milliseconds = 0)
      wxTimeSpan Add(const wxTimeSpan& diff) const
***************
*** 260,274 ****
  %include "wx/datetime.h"
  
  %class %delete %noclassinfo %encapsulate wxDateSpan
      wxDateSpan(int years = 0, int months = 0, int weeks = 0, int days = 0)
-     %builtin %rename wxDateSpan_Days   wxDateSpan wxDateSpan::Days(int days)
-     %builtin %rename wxDateSpan_Day    wxDateSpan wxDateSpan::Day()
-     %builtin %rename wxDateSpan_Weeks  wxDateSpan wxDateSpan::Weeks(int weeks)
-     %builtin %rename wxDateSpan_Week   wxDateSpan wxDateSpan::Week()
-     %builtin %rename wxDateSpan_Months wxDateSpan wxDateSpan::Months(int mon)
-     %builtin %rename wxDateSpan_Month  wxDateSpan wxDateSpan::Month()
-     %builtin %rename wxDateSpan_Years  wxDateSpan wxDateSpan::Years(int years)
-     %builtin %rename wxDateSpan_Year   wxDateSpan wxDateSpan::Year()
- 
      wxDateSpan& SetDays(int n)
      %property=Days, read, write
--- 260,274 ----
  %include "wx/datetime.h"
  
+ %builtin %rename wxDateSpan_Days   wxDateSpan wxDateSpan::Days(int days)
+ %builtin %rename wxDateSpan_Day    wxDateSpan wxDateSpan::Day()
+ %builtin %rename wxDateSpan_Weeks  wxDateSpan wxDateSpan::Weeks(int weeks)
+ %builtin %rename wxDateSpan_Week   wxDateSpan wxDateSpan::Week()
+ %builtin %rename wxDateSpan_Months wxDateSpan wxDateSpan::Months(int mon)
+ %builtin %rename wxDateSpan_Month  wxDateSpan wxDateSpan::Month()
+ %builtin %rename wxDateSpan_Years  wxDateSpan wxDateSpan::Years(int years)
+ %builtin %rename wxDateSpan_Year   wxDateSpan wxDateSpan::Year()
+ 
  %class %delete %noclassinfo %encapsulate wxDateSpan
      wxDateSpan(int years = 0, int months = 0, int weeks = 0, int days = 0)
      wxDateSpan& SetDays(int n)
      %property=Days, read, write

[Wxlua-commit] wxLua/modules/build/msw makefile.bcc,1.10,1.11 makefile.gcc,1.10,1.11 makefile.vc,1.8,1.9 makefile.wat,1.8,1.9

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

Update of /cvsroot/wxlua/wxLua/modules/build/msw
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17181/wxLua/modules/build/msw

Modified Files:
	makefile.bcc makefile.gcc makefile.vc makefile.wat 
Log Message:
rebake, compiles using MSVC free compiler using nmake
remove %noclassinfo for things that have classinfo


Index: makefile.vc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** makefile.vc	23 Nov 2005 06:03:40 -0000	1.8
--- makefile.vc	23 Nov 2005 20:33:15 -0000	1.9
***************
*** 52,56 ****
  ### Variables: ###
  
! MOD_LUA_LIB_CFLAGS = /MD /DWIN32 /I..\..\lua\include $(CPPFLAGS) $(CFLAGS)
  MOD_LUA_LIB_OBJECTS =  \
  	msvc$(WXLIBPOSTFIX)\mod_lua_lib_lapi.obj \
--- 52,57 ----
  ### Variables: ###
  
! MOD_LUA_LIB_CFLAGS = /MD /DWIN32 /DWXLUA_CODE /I..\..\lua\include $(CPPFLAGS) \
! 	$(CFLAGS)
  MOD_LUA_LIB_OBJECTS =  \
  	msvc$(WXLIBPOSTFIX)\mod_lua_lib_lapi.obj \
***************
*** 146,149 ****
--- 147,151 ----
  	msvc$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.obj \
  	msvc$(WXLIBPOSTFIX)\wxbind_lib_wxlua.obj \
+ 	msvc$(WXLIBPOSTFIX)\wxbind_lib_wx_builtin.obj \
  	msvc$(WXLIBPOSTFIX)\wxbind_lib_wx_class.obj \
  	msvc$(WXLIBPOSTFIX)\wxbind_lib_wx_define.obj \
***************
*** 190,193 ****
--- 192,196 ----
  	msvc$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.obj \
  	msvc$(WXLIBPOSTFIX)\wxbind_dll_wxlua.obj \
+ 	msvc$(WXLIBPOSTFIX)\wxbind_dll_wx_builtin.obj \
  	msvc$(WXLIBPOSTFIX)\wxbind_dll_wx_class.obj \
  	msvc$(WXLIBPOSTFIX)\wxbind_dll_wx_define.obj \
***************
*** 651,654 ****
--- 654,660 ----
  	$(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $**
  
+ msvc$(WXLIBPOSTFIX)\wxbind_lib_wx_builtin.obj: ..\..\wxbind\src\wx_builtin.cpp
+ 	$(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $**
+ 
  msvc$(WXLIBPOSTFIX)\wxbind_lib_wx_class.obj: ..\..\wxbind\src\wx_class.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $**
***************
*** 759,762 ****
--- 765,771 ----
  	$(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $**
  
+ msvc$(WXLIBPOSTFIX)\wxbind_dll_wx_builtin.obj: ..\..\wxbind\src\wx_builtin.cpp
+ 	$(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $**
+ 
  msvc$(WXLIBPOSTFIX)\wxbind_dll_wx_class.obj: ..\..\wxbind\src\wx_class.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $**

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** makefile.bcc	23 Nov 2005 06:03:40 -0000	1.10
--- makefile.bcc	23 Nov 2005 20:33:15 -0000	1.11
***************
*** 83,88 ****
  ### Variables: ###
  
! MOD_LUA_LIB_CFLAGS = -I$(BCCDIR)\include -I..\..\lua\include $(CPPFLAGS) \
! 	$(CFLAGS)
  MOD_LUA_LIB_OBJECTS =  \
  	borland$(WXLIBPOSTFIX)\mod_lua_lib_lapi.obj \
--- 83,88 ----
  ### Variables: ###
  
! MOD_LUA_LIB_CFLAGS = -I$(BCCDIR)\include -DWXLUA_CODE -I..\..\lua\include \
! 	$(CPPFLAGS) $(CFLAGS)
  MOD_LUA_LIB_OBJECTS =  \
  	borland$(WXLIBPOSTFIX)\mod_lua_lib_lapi.obj \
***************
*** 173,176 ****
--- 173,177 ----
  	borland$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.obj \
  	borland$(WXLIBPOSTFIX)\wxbind_lib_wxlua.obj \
+ 	borland$(WXLIBPOSTFIX)\wxbind_lib_wx_builtin.obj \
  	borland$(WXLIBPOSTFIX)\wxbind_lib_wx_class.obj \
  	borland$(WXLIBPOSTFIX)\wxbind_lib_wx_define.obj \
***************
*** 216,219 ****
--- 217,221 ----
  	borland$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.obj \
  	borland$(WXLIBPOSTFIX)\wxbind_dll_wxlua.obj \
+ 	borland$(WXLIBPOSTFIX)\wxbind_dll_wx_builtin.obj \
  	borland$(WXLIBPOSTFIX)\wxbind_dll_wx_class.obj \
  	borland$(WXLIBPOSTFIX)\wxbind_dll_wx_define.obj \
***************
*** 666,669 ****
--- 668,674 ----
  	$(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $**
  
+ borland$(WXLIBPOSTFIX)\wxbind_lib_wx_builtin.obj: ..\..\wxbind\src\wx_builtin.cpp
+ 	$(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $**
+ 
  borland$(WXLIBPOSTFIX)\wxbind_lib_wx_class.obj: ..\..\wxbind\src\wx_class.cpp
  	$(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $**
***************
*** 774,777 ****
--- 779,785 ----
  	$(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $**
  
+ borland$(WXLIBPOSTFIX)\wxbind_dll_wx_builtin.obj: ..\..\wxbind\src\wx_builtin.cpp
+ 	$(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $**
+ 
  borland$(WXLIBPOSTFIX)\wxbind_dll_wx_class.obj: ..\..\wxbind\src\wx_class.cpp
  	$(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $**

Index: makefile.wat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** makefile.wat	23 Nov 2005 06:03:40 -0000	1.8
--- makefile.wat	23 Nov 2005 20:33:15 -0000	1.9
***************
*** 176,180 ****
  ### Variables: ###
  
! MOD_LUA_LIB_CFLAGS =  -i=..\..\lua\include  $(CPPFLAGS) $(CFLAGS)
  MOD_LUA_LIB_OBJECTS =  &
  	watcom$(WXLIBPOSTFIX)\mod_lua_lib_lapi.obj &
--- 176,180 ----
  ### Variables: ###
  
! MOD_LUA_LIB_CFLAGS = -dWXLUA_CODE -i=..\..\lua\include $(CPPFLAGS) $(CFLAGS)
  MOD_LUA_LIB_OBJECTS =  &
  	watcom$(WXLIBPOSTFIX)\mod_lua_lib_lapi.obj &
***************
*** 264,267 ****
--- 264,268 ----
  	watcom$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.obj &
  	watcom$(WXLIBPOSTFIX)\wxbind_lib_wxlua.obj &
+ 	watcom$(WXLIBPOSTFIX)\wxbind_lib_wx_builtin.obj &
  	watcom$(WXLIBPOSTFIX)\wxbind_lib_wx_class.obj &
  	watcom$(WXLIBPOSTFIX)\wxbind_lib_wx_define.obj &
***************
*** 306,309 ****
--- 307,311 ----
  	watcom$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.obj &
  	watcom$(WXLIBPOSTFIX)\wxbind_dll_wxlua.obj &
+ 	watcom$(WXLIBPOSTFIX)\wxbind_dll_wx_builtin.obj &
  	watcom$(WXLIBPOSTFIX)\wxbind_dll_wx_class.obj &
  	watcom$(WXLIBPOSTFIX)\wxbind_dll_wx_define.obj &
***************
*** 688,691 ****
--- 690,696 ----
  	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
+ watcom$(WXLIBPOSTFIX)\wxbind_lib_wx_builtin.obj :  .AUTODEPEND ..\..\wxbind\src\wx_builtin.cpp
+ 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
+ 
  watcom$(WXLIBPOSTFIX)\wxbind_lib_wx_class.obj :  .AUTODEPEND ..\..\wxbind\src\wx_class.cpp
  	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
***************
*** 796,799 ****
--- 801,807 ----
  	$(CXX) -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
+ watcom$(WXLIBPOSTFIX)\wxbind_dll_wx_builtin.obj :  .AUTODEPEND ..\..\wxbind\src\wx_builtin.cpp
+ 	$(CXX) -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
+ 
  watcom$(WXLIBPOSTFIX)\wxbind_dll_wx_class.obj :  .AUTODEPEND ..\..\wxbind\src\wx_class.cpp
  	$(CXX) -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<

Index: makefile.gcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** makefile.gcc	23 Nov 2005 06:03:40 -0000	1.10
--- makefile.gcc	23 Nov 2005 20:33:15 -0000	1.11
***************
*** 53,57 ****
  
  CPPDEPS = -MT$@ -MF$@.d -MD
! MOD_LUA_LIB_CFLAGS =  -I..\..\lua\include  $(CPPFLAGS) $(CFLAGS)
  MOD_LUA_LIB_OBJECTS =  \
  	mingw$(WXLIBPOSTFIX)\mod_lua_lib_lapi.o \
--- 53,57 ----
  
  CPPDEPS = -MT$@ -MF$@.d -MD
! MOD_LUA_LIB_CFLAGS = -DWXLUA_CODE -I..\..\lua\include $(CPPFLAGS) $(CFLAGS)
  MOD_LUA_LIB_OBJECTS =  \
  	mingw$(WXLIBPOSTFIX)\mod_lua_lib_lapi.o \
***************
*** 144,147 ****
--- 144,148 ----
  	mingw$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.o \
  	mingw$(WXLIBPOSTFIX)\wxbind_lib_wxlua.o \
+ 	mingw$(WXLIBPOSTFIX)\wxbind_lib_wx_builtin.o \
  	mingw$(WXLIBPOSTFIX)\wxbind_lib_wx_class.o \
  	mingw$(WXLIBPOSTFIX)\wxbind_lib_wx_define.o \
***************
*** 187,190 ****
--- 188,192 ----
  	mingw$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.o \
  	mingw$(WXLIBPOSTFIX)\wxbind_dll_wxlua.o \
+ 	mingw$(WXLIBPOSTFIX)\wxbind_dll_wx_builtin.o \
  	mingw$(WXLIBPOSTFIX)\wxbind_dll_wx_class.o \
  	mingw$(WXLIBPOSTFIX)\wxbind_dll_wx_define.o \
***************
*** 606,609 ****
--- 608,614 ----
  	$(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $<
  
+ mingw$(WXLIBPOSTFIX)\wxbind_lib_wx_builtin.o: ../../wxbind/src/wx_builtin.cpp
+ 	$(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $<
+ 
  mingw$(WXLIBPOSTFIX)\wxbind_lib_wx_class.o: ../../wxbind/src/wx_class.cpp
  	$(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $<
***************
*** 714,717 ****
--- 719,725 ----
  	$(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(CPPDEPS) $<
  
+ mingw$(WXLIBPOSTFIX)\wxbind_dll_wx_builtin.o: ../../wxbind/src/wx_builtin.cpp
+ 	$(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(CPPDEPS) $<
+ 
  mingw$(WXLIBPOSTFIX)\wxbind_dll_wx_class.o: ../../wxbind/src/wx_class.cpp
  	$(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(CPPDEPS) $<

[Wxlua-commit] wxLua/apps/build/msw makefile.bcc,1.7,1.8 makefile.gcc,1.7,1.8 makefile.vc,1.5,1.6 makefile.wat,1.7,1.8

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

Update of /cvsroot/wxlua/wxLua/apps/build/msw
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17181/wxLua/apps/build/msw

Modified Files:
	makefile.bcc makefile.gcc makefile.vc makefile.wat 
Log Message:
rebake, compiles using MSVC free compiler using nmake
remove %noclassinfo for things that have classinfo


Index: makefile.vc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** makefile.vc	23 Nov 2005 06:03:40 -0000	1.5
--- makefile.vc	23 Nov 2005 20:33:14 -0000	1.6
***************
*** 163,167 ****
  ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
  	link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_5)  /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<<
! 	$(APP_WXLUA_OBJECTS)  wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib
  <<
  
--- 163,167 ----
  ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
  	link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_5)  /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<<
! 	$(APP_WXLUA_OBJECTS)  wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib
  <<
  

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** makefile.bcc	23 Nov 2005 06:03:40 -0000	1.7
--- makefile.bcc	23 Nov 2005 20:33:14 -0000	1.8
***************
*** 161,165 ****
  ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS)  borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
  	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO)  -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&|
! 	c0x32.obj $(APP_WXLUA_OBJECTS),$@,, wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
  |
  
--- 161,165 ----
  ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS)  borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
  	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO)  -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&|
! 	c0x32.obj $(APP_WXLUA_OBJECTS),$@,, wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
  |
  

Index: makefile.wat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** makefile.wat	23 Nov 2005 06:03:40 -0000	1.7
--- makefile.wat	23 Nov 2005 20:33:14 -0000	1.8
***************
*** 171,175 ****
  	@%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_3)  libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES)
  	@for %i in ($(APP_WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc file %i
! 	@for %i in ( wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc library %i
  	@%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc option resource=watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
  	wlink @watcom$(WXLIBPOSTFIX)\app_wxlua.lbc
--- 171,175 ----
  	@%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_3)  libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES)
  	@for %i in ($(APP_WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc file %i
! 	@for %i in ( wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc library %i
  	@%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc option resource=watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
  	wlink @watcom$(WXLIBPOSTFIX)\app_wxlua.lbc

Index: makefile.gcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** makefile.gcc	23 Nov 2005 06:03:40 -0000	1.7
--- makefile.gcc	23 Nov 2005 20:33:14 -0000	1.8
***************
*** 141,145 ****
  
  ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o
! 	$(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES)  -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
  
  mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua.o: ../../wxlua/src/wxlua.cpp
--- 141,145 ----
  
  ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o
! 	$(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES)  -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
  
  mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua.o: ../../wxlua/src/wxlua.cpp

[Wxlua-commit] wxLua/modules/build/bakefiles modules.bkl,1.8,1.9 sources.bkl,1.5,1.6

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

Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17181/wxLua/modules/build/bakefiles

Modified Files:
	modules.bkl sources.bkl 
Log Message:
rebake, compiles using MSVC free compiler using nmake
remove %noclassinfo for things that have classinfo


Index: sources.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/sources.bkl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** sources.bkl	20 Nov 2005 12:11:48 -0000	1.5
--- sources.bkl	23 Nov 2005 20:33:15 -0000	1.6
***************
*** 82,85 ****
--- 82,86 ----
          wxbind/src/wxlprint.cpp 	
          wxbind/src/wxlua.cpp 	
+         wxbind/src/wx_builtin.cpp 	
          wxbind/src/wx_class.cpp 	
          wxbind/src/wx_define.cpp 	

Index: modules.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** modules.bkl	20 Nov 2005 12:11:48 -0000	1.8
--- modules.bkl	23 Nov 2005 20:33:15 -0000	1.9
***************
*** 187,190 ****
--- 187,191 ----
                 the same conventions followed by other modules... -->
      <lib id="mod_lua_lib">
+         <define>WXLUA_CODE</define>
          <sources>$(lua_src) $(lualib_src)</sources>
          <headers>(lua_hdr) $(lualib_hdr)</headers>

[Wxlua-commit] wxLua/apps Makefile.in,1.6,1.7

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

Update of /cvsroot/wxlua/wxLua/apps
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17181/wxLua/apps

Modified Files:
	Makefile.in 
Log Message:
rebake, compiles using MSVC free compiler using nmake
remove %noclassinfo for things that have classinfo


Index: Makefile.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.in	23 Nov 2005 06:03:39 -0000	1.6
--- Makefile.in	23 Nov 2005 20:33:14 -0000	1.7
***************
*** 58,62 ****
  
  ../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc)
! 	$(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L../lib  $(WX_LIBS) -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua
  	
  	$(__app_wxlua___mac_setfilecmd)
--- 58,62 ----
  
  ../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc)
! 	$(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L../lib  -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua $(WX_LIBS)
  	
  	$(__app_wxlua___mac_setfilecmd)

[Wxlua-commit] wxLua/bindings/wxwidgets data.i,1.3,1.4 fl.i,1.2,1.3 html.i,1.2,1.3 wxlua.i,1.3,1.4 wxLuaWrap.lua,1.1,NONE

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

Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17181/wxLua/bindings/wxwidgets

Modified Files:
	data.i fl.i html.i wxlua.i 
Removed Files:
	wxLuaWrap.lua 
Log Message:
rebake, compiles using MSVC free compiler using nmake
remove %noclassinfo for things that have classinfo


Index: fl.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/fl.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** fl.i	18 Jun 2005 20:45:59 -0000	1.2
--- fl.i	23 Nov 2005 20:33:14 -0000	1.3
***************
*** 115,119 ****
  %endclass
  
! %class %noclassinfo %delete cbDimInfo, wxObject
      %constructor cbDimInfoDefault()
      %constructor cbDimInfoFixed(cbBarDimHandlerBase* pDimHandler, bool isFixed)
--- 115,119 ----
  %endclass
  
! %class %delete %noclassinfo cbDimInfo, wxObject
      %constructor cbDimInfoDefault()
      %constructor cbDimInfoFixed(cbBarDimHandlerBase* pDimHandler, bool isFixed)

--- wxLuaWrap.lua DELETED ---

Index: wxlua.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxlua.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxlua.i	18 Jun 2005 20:45:59 -0000	1.3
--- wxlua.i	23 Nov 2005 20:33:14 -0000	1.4
***************
*** 36,40 ****
  %include "wxluasocket/include/dserver.h"
  
! %class %noclassinfo %delete wxLuaDebugServer
      wxLuaDebugServer(int portNumber)
      %constructor wxLuaDebugServerCompile(const wxString &buffer, const wxString &fileName)
--- 36,40 ----
  %include "wxluasocket/include/dserver.h"
  
! %class %delete %noclassinfo wxLuaDebugServer
      wxLuaDebugServer(int portNumber)
      %constructor wxLuaDebugServerCompile(const wxString &buffer, const wxString &fileName)

Index: html.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/html.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** html.i	18 Jun 2005 20:45:59 -0000	1.2
--- html.i	23 Nov 2005 20:33:14 -0000	1.3
***************
*** 14,18 ****
  %include "wx/html/htmlcell.h"
  
! %class %noclassinfo wxHtmlCell
      wxHtmlCell()
      virtual bool AdjustPagebreak(int * pagebreak)
--- 14,18 ----
  %include "wx/html/htmlcell.h"
  
! %class wxHtmlCell
      wxHtmlCell()
      virtual bool AdjustPagebreak(int * pagebreak)
***************
*** 50,54 ****
  // wxHtmlWidgetCell
  
! %class %noclassinfo wxHtmlWidgetCell, wxHtmlCell
      wxHtmlWidgetCell(wxWindow* wnd, int w = 0)
  %endclass
--- 50,54 ----
  // wxHtmlWidgetCell
  
! %class wxHtmlWidgetCell, wxHtmlCell
      wxHtmlWidgetCell(wxWindow* wnd, int w = 0)
  %endclass
***************
*** 181,185 ****
  // wxHtmlParser
  
! %class %noclassinfo wxHtmlParser
      //wxHtmlParser()
      //void AddTag(const wxHtmlTag& tag)
--- 181,185 ----
  // wxHtmlParser
  
! %class wxHtmlParser
      //wxHtmlParser()
      //void AddTag(const wxHtmlTag& tag)
***************
*** 196,200 ****
  // wxHtmlWinParser
  
! %class %noclassinfo wxHtmlWinParser, wxHtmlParser
      wxHtmlWinParser(wxHtmlWindow *wnd)
      wxHtmlContainerCell* CloseContainer()
--- 196,200 ----
  // wxHtmlWinParser
  
! %class wxHtmlWinParser, wxHtmlParser
      wxHtmlWinParser(wxHtmlWindow *wnd)
      wxHtmlContainerCell* CloseContainer()

Index: data.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/data.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** data.i	17 Nov 2005 05:51:20 -0000	1.3
--- data.i	23 Nov 2005 20:33:14 -0000	1.4
***************
*** 397,401 ****
  
  %include "wx/protocol/http.h"
! %class %noclassinfo %delete wxHTTP, wxProtocol
      wxHTTP()
      wxInputStream *GetInputStream(const wxString& path)
--- 397,401 ----
  
  %include "wx/protocol/http.h"
! %class %delete %noclassinfo wxHTTP, wxProtocol
      wxHTTP()
      wxInputStream *GetInputStream(const wxString& path)
***************
*** 415,419 ****
  %endenum
  
! %class %noclassinfo %delete wxFTP, wxProtocol
      wxFTP()
      bool Abort()
--- 415,419 ----
  %endenum
  
! %class %delete %noclassinfo wxFTP, wxProtocol
      wxFTP()
      bool Abort()

[Wxlua-commit] wxLua/modules Makefile.in,1.8,1.9

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

Update of /cvsroot/wxlua/wxLua/modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17181/wxLua/modules

Modified Files:
	Makefile.in 
Log Message:
rebake, compiles using MSVC free compiler using nmake
remove %noclassinfo for things that have classinfo


Index: Makefile.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile.in	23 Nov 2005 06:03:40 -0000	1.8
--- Makefile.in	23 Nov 2005 20:33:15 -0000	1.9
***************
*** 37,41 ****
  
  DESTDIR = 
! MOD_LUA_LIB_CFLAGS =  -I./lua/include  $(CPPFLAGS) $(CFLAGS)
  MOD_LUA_LIB_OBJECTS =  \
  	mod_lua_lib_lapi.o \
--- 37,41 ----
  
  DESTDIR = 
! MOD_LUA_LIB_CFLAGS =  -DWXLUA_CODE -I./lua/include  $(CPPFLAGS) $(CFLAGS)
  MOD_LUA_LIB_OBJECTS =  \
  	mod_lua_lib_lapi.o \
***************
*** 114,117 ****
--- 114,118 ----
  	wxbind_lib_wxlprint.o \
  	wxbind_lib_wxlua.o \
+ 	wxbind_lib_wx_builtin.o \
  	wxbind_lib_wx_class.o \
  	wxbind_lib_wx_define.o \
***************
*** 153,156 ****
--- 154,158 ----
  	wxbind_dll_wxlprint.o \
  	wxbind_dll_wxlua.o \
+ 	wxbind_dll_wx_builtin.o \
  	wxbind_dll_wx_class.o \
  	wxbind_dll_wx_define.o \
***************
*** 565,568 ****
--- 567,573 ----
  	$(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/wxlua.cpp
  
+ wxbind_lib_wx_builtin.o: ./wxbind/src/wx_builtin.cpp
+ 	$(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/wx_builtin.cpp
+ 
  wxbind_lib_wx_class.o: ./wxbind/src/wx_class.cpp
  	$(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/wx_class.cpp
***************
*** 673,676 ****
--- 678,684 ----
  	$(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/wxlua.cpp
  
+ wxbind_dll_wx_builtin.o: ./wxbind/src/wx_builtin.cpp
+ 	$(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/wx_builtin.cpp
+ 
  wxbind_dll_wx_class.o: ./wxbind/src/wx_class.cpp
  	$(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/wx_class.cpp

[Wxlua-commit] wxLua/apps/build/bakefiles apps.bkl,1.5,1.6

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

Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17181/wxLua/apps/build/bakefiles

Modified Files:
	apps.bkl 
Log Message:
rebake, compiles using MSVC free compiler using nmake
remove %noclassinfo for things that have classinfo


Index: apps.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** apps.bkl	21 Nov 2005 23:42:59 -0000	1.5
--- apps.bkl	23 Nov 2005 20:33:14 -0000	1.6
***************
*** 65,72 ****
          <wxlua-lib>wxbind</wxlua-lib>
          <wxlua-lib>lua</wxlua-lib>
          <wx-lib>adv</wx-lib>
!         <wx-lib>xml</wx-lib>
          <wx-lib>core</wx-lib>
!         <wx-lib>base</wx-lib>        
      </exe>
      
--- 65,79 ----
          <wxlua-lib>wxbind</wxlua-lib>
          <wxlua-lib>lua</wxlua-lib>
+ 
          <wx-lib>adv</wx-lib>
!         <wx-lib>base</wx-lib>  
          <wx-lib>core</wx-lib>
!         <wx-lib>html</wx-lib>  
!         <wx-lib>media</wx-lib>  
!         <wx-lib>net</wx-lib>  
!         <wx-lib>xml</wx-lib>
!         <wx-lib>xrc</wx-lib>
! 
!         <wx-lib>stc</wx-lib>
      </exe>
      

[Wxlua-commit] wxLua/util/build/msw makefile.bcc,1.4,1.5 makefile.gcc,1.4,1.5 makefile.vc,1.4,1.5 makefile.wat,1.4,1.5

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

Update of /cvsroot/wxlua/wxLua/util/build/msw
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25784/wxLua/util/build/msw

Modified Files:
	makefile.bcc makefile.gcc makefile.vc makefile.wat 
Log Message:
rebaked the build files to remove the unused wxluawrap.cpp file
started docs for building wxlua


Index: makefile.vc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/util/build/msw/makefile.vc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** makefile.vc	20 Nov 2005 11:35:18 -0000	1.4
--- makefile.vc	23 Nov 2005 06:03:40 -0000	1.5
***************
*** 32,38 ****
  WX_DEBUG = 1
  
- # Use monolithic build of wxWidgets? [0,1]
- WX_MONOLITHIC = 0
- 
  # Does the wxLua utilities should be compiled ? [0,1]
  USE_BIN2C = 1
--- 32,35 ----

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/util/build/msw/makefile.bcc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** makefile.bcc	20 Nov 2005 11:35:18 -0000	1.4
--- makefile.bcc	23 Nov 2005 06:03:40 -0000	1.5
***************
*** 55,63 ****
  !endif
  
- # Use monolithic build of wxWidgets? [0,1]
- !ifndef WX_MONOLITHIC
- WX_MONOLITHIC = 0
- !endif
- 
  # Does the wxLua utilities should be compiled ? [0,1]
  !ifndef USE_BIN2C
--- 55,58 ----

Index: makefile.wat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/util/build/msw/makefile.wat,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** makefile.wat	20 Nov 2005 11:35:18 -0000	1.4
--- makefile.wat	23 Nov 2005 06:03:40 -0000	1.5
***************
*** 32,38 ****
  WX_DEBUG = 1
  
- # Use monolithic build of wxWidgets? [0,1]
- WX_MONOLITHIC = 0
- 
  # Does the wxLua utilities should be compiled ? [0,1]
  USE_BIN2C = 1
--- 32,35 ----
***************
*** 103,106 ****
  
  watcom\util_bin2c_bin2c.obj :  .AUTODEPEND ..\..\bin2c\bin2c.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(UTIL_BIN2C_CFLAGS) $<
  
--- 100,103 ----
  
  watcom\util_bin2c_bin2c.obj :  .AUTODEPEND ..\..\bin2c\bin2c.c
! 	$(CC) -zq -fo=$^@ $(UTIL_BIN2C_CFLAGS) $<
  

Index: makefile.gcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/util/build/msw/makefile.gcc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** makefile.gcc	20 Nov 2005 11:35:18 -0000	1.4
--- makefile.gcc	23 Nov 2005 06:03:40 -0000	1.5
***************
*** 32,38 ****
  WX_DEBUG = 1
  
- # Use monolithic build of wxWidgets? [0,1]
- WX_MONOLITHIC = 0
- 
  # Does the wxLua utilities should be compiled ? [0,1]
  USE_BIN2C = 1
--- 32,35 ----

[Wxlua-commit] wxLua/docs building.txt,NONE,1.1

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

Update of /cvsroot/wxlua/wxLua/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25784/wxLua/docs

Added Files:
	building.txt 
Log Message:
rebaked the build files to remove the unused wxluawrap.cpp file
started docs for building wxlua


--- NEW FILE: building.txt ---
wxLua/docs/build.txt

This document describes how to build wxLua for use as an interpreter of lua 
scripts and to embedding wxLua in a C++ project.

------------------------------------------------------------------------------
Building wxLua
------------------------------------------------------------------------------

wxLua can be compiled in any platform and by any compiler that is supported by 
wxWidgets.

What libraries need to get build?
  wxLua/modules/lua   - lua itself, see www.lua.org
  wxLua/modules/wxlua - the base wxlua package
  wxLua/modules/wxbind - the bindings of wxWidgets for use in lua scripts
  wxLua/modules/wxluadebug - helpful classes for debugging lua
  wxLua/modules/wxluasocket - socket classes to run a wxlua program in a 
                                separate process and communicate with the parent

How to build the wxLua libaries
  MSW - enter wxLua/build/msw and build everything using
    MS VC   : nmake -f makefile.vc
    GCC     : make -f makefile.gcc
    BORLAND : make -f makefile.bcc
        
  Linux - in root wxLua directory run
    $./configure --prefix=path/to/where/you/want/it/built
    $make
    
How to build the wxLua app, the wxLua IDE
  The app depends on the libaries from modules/lua, wxlua, wxbind, 
  wxluadebug, and wxluasocket. You must have previously built these.

  MSW - if and you've run make from wxLua/build/msw you already have it.
  You want to build/rebuild it then enter wxLua/apps/build/msw and use the 
  same commands for make as described for the libaries.
    
  Linux - type make in the wxLua/wxlua/src
   
------------------------------------------------------------------------------
Advanced building options
------------------------------------------------------------------------------

  These directions are for C++ developers who want to use wxLua as a scripting
language in their own project. This means that you can write scripts to make 
your code simpler, load and run files on the fly, and allow users to more 
easily customize your program with their own lua scripts.

  You will need the library from wxLua/modules/lua and wxlua at a minimum. With
these two libraries you have the ability to start an interpreter and run
straight lua code in it. 
  To get the ability to create wxWidgets objects and use the functionality of 
wxWidgets in lua you will also need to build and link to the library in 
modules/wxbind. The bindings in modules/wxbind contain nearly all of the 
classes and functions in wxWidgets. They also contain the appropriate 
wxUSE_XXX #if statements and platform dependent __WXMSW__ checks that 
wxWidgets uses in their headers to ensure that no matter what platform
or what type of build you use, the bindings will compile without error.
The functionality will obviously be limited to your current wxWidgets build
settings.
  In order to reduce the size of the wxWidgets bindings there is a file 
modules/wxbind/src/wxluasetup.h that can be edited to your liking. The header 
file contains a number of wxLUA_USE_XXX #defines that are fairly self 
explanitory. By setting some of them to 0 you can block out large chunks of 
the bindings. NOTE: If you edit the wxluasetup.h file in modules/wxbind/src 
directory you will affect which bindings will be available to apps/wxlua as 
well. 
  If you wish to use the build files for modlues/wxbind that exist in wxLua
for your own project along with your own wxluasetup.h you need to...

[Wxlua-commit] wxLua/build/msw makefile.bcc,1.5,1.6 makefile.gcc,1.5,1.6 makefile.vc,1.6,1.7 makefile.wat,1.5,1.6

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

Update of /cvsroot/wxlua/wxLua/build/msw
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25784/wxLua/build/msw

Modified Files:
	makefile.bcc makefile.gcc makefile.vc makefile.wat 
Log Message:
rebaked the build files to remove the unused wxluawrap.cpp file
started docs for building wxlua


Index: makefile.vc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** makefile.vc	20 Nov 2005 11:35:18 -0000	1.6
--- makefile.vc	23 Nov 2005 06:03:40 -0000	1.7
***************
*** 26,32 ****
  WX_VERSION = 26
  
- # Use monolithic build of wxWidgets? [0,1]
- WX_MONOLITHIC = 0
- 
  # Does the wxLua utilities should be compiled ? [0,1]
  USE_BIN2C = 1
--- 26,29 ----
***************
*** 55,62 ****
  	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \
  	WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \
! 	WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" \
! 	USE_BIN2C="$(USE_BIN2C)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \
! 	USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_UTIL="$(USE_UTIL)" \
! 	USE_APPS="$(USE_APPS)"
  
  ### Conditionally set variables: ###
--- 52,58 ----
  	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \
  	WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \
! 	WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" \
! 	USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" \
! 	USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)"
  
  ### Conditionally set variables: ###

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** makefile.bcc	20 Nov 2005 11:35:18 -0000	1.5
--- makefile.bcc	23 Nov 2005 06:03:40 -0000	1.6
***************
*** 75,83 ****
  !endif
  
- # Use monolithic build of wxWidgets? [0,1]
- !ifndef WX_MONOLITHIC
- WX_MONOLITHIC = 0
- !endif
- 
  # Does the wxLua utilities should be compiled ? [0,1]
  !ifndef USE_BIN2C
--- 75,78 ----
***************
*** 117,122 ****
  	-DWX_DIR="$(WX_DIR)" -DWX_SHARED="$(WX_SHARED)" \
  	-DWX_UNICODE="$(WX_UNICODE)" -DWX_DEBUG="$(WX_DEBUG)" \
! 	-DWX_VERSION="$(WX_VERSION)" -DWX_MONOLITHIC="$(WX_MONOLITHIC)" \
! 	-DUSE_BIN2C="$(USE_BIN2C)" -DUSE_WXLUADEBUG="$(USE_WXLUADEBUG)" \
  	-DUSE_WXLUASOCKET="$(USE_WXLUASOCKET)" -DUSE_UTIL="$(USE_UTIL)" \
  	-DUSE_APPS="$(USE_APPS)"
--- 112,117 ----
  	-DWX_DIR="$(WX_DIR)" -DWX_SHARED="$(WX_SHARED)" \
  	-DWX_UNICODE="$(WX_UNICODE)" -DWX_DEBUG="$(WX_DEBUG)" \
! 	-DWX_VERSION="$(WX_VERSION)" -DUSE_BIN2C="$(USE_BIN2C)" \
! 	-DUSE_WXLUADEBUG="$(USE_WXLUADEBUG)" \
  	-DUSE_WXLUASOCKET="$(USE_WXLUASOCKET)" -DUSE_UTIL="$(USE_UTIL)" \
  	-DUSE_APPS="$(USE_APPS)"

Index: makefile.wat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** makefile.wat	20 Nov 2005 11:35:18 -0000	1.5
--- makefile.wat	23 Nov 2005 06:03:40 -0000	1.6
***************
*** 26,32 ****
  WX_VERSION = 26
  
- # Use monolithic build of wxWidgets? [0,1]
- WX_MONOLITHIC = 0
- 
  # Does the wxLua utilities should be compiled ? [0,1]
  USE_BIN2C = 1
--- 26,29 ----
***************
*** 81,88 ****
  	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" &
  	WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" &
! 	WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" &
! 	USE_BIN2C="$(USE_BIN2C)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" &
! 	USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_UTIL="$(USE_UTIL)" &
! 	USE_APPS="$(USE_APPS)"
  
  
--- 78,84 ----
  	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" &
  	WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" &
! 	WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" &
! 	USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" &
! 	USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)"
  
  

Index: makefile.gcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** makefile.gcc	20 Nov 2005 11:35:18 -0000	1.5
--- makefile.gcc	23 Nov 2005 06:03:40 -0000	1.6
***************
*** 26,32 ****
  WX_VERSION = 26
  
- # Use monolithic build of wxWidgets? [0,1]
- WX_MONOLITHIC = 0
- 
  # Does the wxLua utilities should be compiled ? [0,1]
  USE_BIN2C = 1
--- 26,29 ----
***************
*** 55,62 ****
  	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \
  	WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \
! 	WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" \
! 	USE_BIN2C="$(USE_BIN2C)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \
! 	USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_UTIL="$(USE_UTIL)" \
! 	USE_APPS="$(USE_APPS)"
  
  ### Conditionally set variables: ###
--- 52,58 ----
  	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \
  	WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \
! 	WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" \
! 	USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" \
! 	USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)"
  
  ### Conditionally set variables: ###

[Wxlua-commit] wxLua/modules/build/msw makefile.bcc,1.9,1.10 makefile.gcc,1.9,1.10 makefile.vc,1.7,1.8 makefile.wat,1.7,1.8

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

Update of /cvsroot/wxlua/wxLua/modules/build/msw
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25784/wxLua/modules/build/msw

Modified Files:
	makefile.bcc makefile.gcc makefile.vc makefile.wat 
Log Message:
rebaked the build files to remove the unused wxluawrap.cpp file
started docs for building wxlua


Index: makefile.vc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** makefile.vc	20 Nov 2005 12:11:49 -0000	1.7
--- makefile.vc	23 Nov 2005 06:03:40 -0000	1.8
***************
*** 44,50 ****
  WX_VERSION = 26
  
- # Use monolithic build of wxWidgets? [0,1]
- WX_MONOLITHIC = 0
- 
  
  
--- 44,47 ----
***************
*** 286,349 ****
  __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\vc_dll
  !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib
- !endif
  !if "$(WX_UNICODE)" == "1"
  __WXUNICODE_DEFINE_p = /D_UNICODE
--- 283,286 ----
***************
*** 467,471 ****
  ..\..\..\lib\vc_dll\wxlua_dll.dll: $(WXLUA_DLL_OBJECTS)
  	link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_2)  /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<<
! 	$(WXLUA_DLL_OBJECTS)  $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_ADV_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxlua.lib
  <<
  !endif
--- 404,408 ----
  ..\..\..\lib\vc_dll\wxlua_dll.dll: $(WXLUA_DLL_OBJECTS)
  	link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_2)  /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<<
! 	$(WXLUA_DLL_OBJECTS)  wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxlua.lib
  <<
  !endif
***************
*** 482,486 ****
  ..\..\..\lib\vc_dll\wxbind_dll.dll: $(WXBIND_DLL_OBJECTS)
  	link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_2)  /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<<
! 	$(WXBIND_DLL_OBJECTS)  $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_ADV_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxbind.lib
  <<
  !endif
--- 419,423 ----
  ..\..\..\lib\vc_dll\wxbind_dll.dll: $(WXBIND_DLL_OBJECTS)
  	link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_2)  /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<<
! 	$(WXBIND_DLL_OBJECTS)  wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxbind.lib
  <<
  !endif
***************
*** 497,501 ****
  ..\..\..\lib\vc_dll\wxluadebug_dll.dll: $(WXLUADEBUG_DLL_OBJECTS)
  	link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_2)  /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<<
! 	$(WXLUADEBUG_DLL_OBJECTS)  $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_ADV_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxluadebug.lib
  <<
  !endif
--- 434,438 ----
  ..\..\..\lib\vc_dll\wxluadebug_dll.dll: $(WXLUADEBUG_DLL_OBJECTS)
  	link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_2)  /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<<
! 	$(WXLUADEBUG_DLL_OBJECTS)  wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxluadebug.lib
  <<
  !endif
***************
*** 512,516 ****
  ..\..\..\lib\vc_dll\wxluasocket_dll.dll: $(WXLUASOCKET_DLL_OBJECTS)
  	link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_2)  /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<<
! 	$(WXLUASOCKET_DLL_OBJECTS)  $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_ADV_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxluasocket.lib
  <<
  !endif
--- 449,453 ----
  ..\..\..\lib\vc_dll\wxluasocket_dll.dll: $(WXLUASOCKET_DLL_OBJECTS)
  	link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_2)  /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<<
! 	$(WXLUASOCKET_DLL_OBJECTS)  wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxluasocket.lib
  <<
  !endif

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** makefile.bcc	20 Nov 2005 12:11:48 -0000	1.9
--- makefile.bcc	23 Nov 2005 06:03:40 -0000	1.10
***************
*** 75,83 ****
  !endif
  
- # Use monolithic build of wxWidgets? [0,1]
- !ifndef WX_MONOLITHIC
- WX_MONOLITHIC = 0
- !endif
- 
  
  
--- 75,78 ----
***************
*** 302,365 ****
  __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_dll
  !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib
- !endif
  !if "$(WX_UNICODE)" == "1"
  __WXUNICODE_DEFINE_p = -D_UNICODE
--- 297,300 ----
***************
*** 480,484 ****
  ..\..\..\lib\bcc_dll\wxlua_dll.dll: $(WXLUA_DLL_OBJECTS)
  	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO)  -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&|
! 	c0d32.obj $(WXLUA_DLL_OBJECTS),$@,, $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_ADV_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,,
  |
  	implib -f ..\..\..\lib\bcc_dll\wxlua $@
--- 415,419 ----
  ..\..\..\lib\bcc_dll\wxlua_dll.dll: $(WXLUA_DLL_OBJECTS)
  	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO)  -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&|
! 	c0d32.obj $(WXLUA_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,,
  |
  	implib -f ..\..\..\lib\bcc_dll\wxlua $@
***************
*** 496,500 ****
  ..\..\..\lib\bcc_dll\wxbind_dll.dll: $(WXBIND_DLL_OBJECTS)
  	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO)  -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&|
! 	c0d32.obj $(WXBIND_DLL_OBJECTS),$@,, $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_ADV_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,,
  |
  	implib -f ..\..\..\lib\bcc_dll\wxbind $@
--- 431,435 ----
  ..\..\..\lib\bcc_dll\wxbind_dll.dll: $(WXBIND_DLL_OBJECTS)
  	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO)  -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&|
! 	c0d32.obj $(WXBIND_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,,
  |
  	implib -f ..\..\..\lib\bcc_dll\wxbind $@
***************
*** 512,516 ****
  ..\..\..\lib\bcc_dll\wxluadebug_dll.dll: $(WXLUADEBUG_DLL_OBJECTS)
  	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO)  -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&|
! 	c0d32.obj $(WXLUADEBUG_DLL_OBJECTS),$@,, $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_ADV_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,,
  |
  	implib -f ..\..\..\lib\bcc_dll\wxluadebug $@
--- 447,451 ----
  ..\..\..\lib\bcc_dll\wxluadebug_dll.dll: $(WXLUADEBUG_DLL_OBJECTS)
  	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO)  -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&|
! 	c0d32.obj $(WXLUADEBUG_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,,
  |
  	implib -f ..\..\..\lib\bcc_dll\wxluadebug $@
***************
*** 528,532 ****
  ..\..\..\lib\bcc_dll\wxluasocket_dll.dll: $(WXLUASOCKET_DLL_OBJECTS)
  	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO)  -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&|
! 	c0d32.obj $(WXLUASOCKET_DLL_OBJECTS),$@,, $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_ADV_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,,
  |
  	implib -f ..\..\..\lib\bcc_dll\wxluasocket $@
--- 463,467 ----
  ..\..\..\lib\bcc_dll\wxluasocket_dll.dll: $(WXLUASOCKET_DLL_OBJECTS)
  	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO)  -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&|
! 	c0d32.obj $(WXLUASOCKET_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,,
  |
  	implib -f ..\..\..\lib\bcc_dll\wxluasocket $@

Index: makefile.wat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** makefile.wat	20 Nov 2005 12:11:49 -0000	1.7
--- makefile.wat	23 Nov 2005 06:03:40 -0000	1.8
***************
*** 44,50 ****
  WX_VERSION = 26
  
- # Use monolithic build of wxWidgets? [0,1]
- WX_MONOLITHIC = 0
- 
  
  
--- 44,47 ----
***************
*** 120,267 ****
  __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\wat_dll
  !endif
- __WXLIB_BASE_NAME_p =
- !ifeq WX_DEBUG 0
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 0
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 0
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 1
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 0
- !ifeq WX_MONOLITHIC 1
- !ifeq WX_UNICODE 0
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 0
- !ifeq WX_MONOLITHIC 1
- !ifeq WX_UNICODE 1
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 1
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 0
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 1
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 1
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 1
- !ifeq WX_MONOLITHIC 1
- !ifeq WX_UNICODE 0
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 1
- !ifeq WX_MONOLITHIC 1
- !ifeq WX_UNICODE 1
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib
- !endif
- !endif
- !endif
- __WXLIB_CORE_NAME_p =
- !ifeq WX_DEBUG 0
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 0
- __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 0
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 1
- __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 1
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 0
- __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 1
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 1
- __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib
- !endif
- !endif
- !endif
- __WXLIB_XML_NAME_p =
- !ifeq WX_DEBUG 0
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 0
- __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 0
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 1
- __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 1
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 0
- __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 1
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 1
- __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib
- !endif
- !endif
- !endif
- __WXLIB_ADV_NAME_p =
- !ifeq WX_DEBUG 0
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 0
- __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 0
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 1
- __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 1
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 0
- __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 1
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 1
- __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib
- !endif
- !endif
- !endif
  __WXUNICODE_DEFINE_p =
  !ifeq WX_UNICODE 1
--- 117,120 ----
***************
*** 564,570 ****
  	@%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_3)  libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES)
  	@for %i in ($(WXLUA_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc file %i
! 	@for %i in ( $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_ADV_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc library %i
  	@%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc
! 	@%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc system nr_dll
  	wlink @watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc
  	wlib -q -n -b ..\..\..\lib\wat_dll\wxlua.lib +$^@
--- 417,423 ----
  	@%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_3)  libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES)
  	@for %i in ($(WXLUA_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc file %i
! 	@for %i in ( wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc library %i
  	@%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc
! 	@%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc system nt_dll
  	wlink @watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc
  	wlib -q -n -b ..\..\..\lib\wat_dll\wxlua.lib +$^@
***************
*** 586,592 ****
  	@%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_3)  libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES)
  	@for %i in ($(WXBIND_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc file %i
! 	@for %i in ( $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_ADV_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc library %i
  	@%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc
! 	@%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc system nr_dll
  	wlink @watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc
  	wlib -q -n -b ..\..\..\lib\wat_dll\wxbind.lib +$^@
--- 439,445 ----
  	@%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_3)  libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES)
  	@for %i in ($(WXBIND_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc file %i
! 	@for %i in ( wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc library %i
  	@%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc
! 	@%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc system nt_dll
  	wlink @watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc
  	wlib -q -n -b ..\..\..\lib\wat_dll\wxbind.lib +$^@
***************
*** 608,614 ****
  	@%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_3)  libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES)
  	@for %i in ($(WXLUADEBUG_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc file %i
! 	@for %i in ( $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_ADV_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc library %i
  	@%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc
! 	@%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc system nr_dll
  	wlink @watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc
  	wlib -q -n -b ..\..\..\lib\wat_dll\wxluadebug.lib +$^@
--- 461,467 ----
  	@%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_3)  libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES)
  	@for %i in ($(WXLUADEBUG_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc file %i
! 	@for %i in ( wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc library %i
  	@%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc
! 	@%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc system nt_dll
  	wlink @watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc
  	wlib -q -n -b ..\..\..\lib\wat_dll\wxluadebug.lib +$^@
***************
*** 630,636 ****
  	@%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_3)  libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES)
  	@for %i in ($(WXLUASOCKET_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc file %i
! 	@for %i in ( $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_ADV_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc library %i
  	@%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc
! 	@%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc system nr_dll
  	wlink @watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc
  	wlib -q -n -b ..\..\..\lib\wat_dll\wxluasocket.lib +$^@
--- 483,489 ----
  	@%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_3)  libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES)
  	@for %i in ($(WXLUASOCKET_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc file %i
! 	@for %i in ( wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc library %i
  	@%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc
! 	@%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc system nt_dll
  	wlink @watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc
  	wlib -q -n -b ..\..\..\lib\wat_dll\wxluasocket.lib +$^@
***************
*** 638,1001 ****
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lapi.obj :  .AUTODEPEND ..\..\lua\src\lapi.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lcode.obj :  .AUTODEPEND ..\..\lua\src\lcode.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_ldebug.obj :  .AUTODEPEND ..\..\lua\src\ldebug.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_ldo.obj :  .AUTODEPEND ..\..\lua\src\ldo.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_ldump.obj :  .AUTODEPEND ..\..\lua\src\ldump.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lfunc.obj :  .AUTODEPEND ..\..\lua\src\lfunc.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lgc.obj :  .AUTODEPEND ..\..\lua\src\lgc.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_llex.obj :  .AUTODEPEND ..\..\lua\src\llex.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lmem.obj :  .AUTODEPEND ..\..\lua\src\lmem.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lobject.obj :  .AUTODEPEND ..\..\lua\src\lobject.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lopcodes.obj :  .AUTODEPEND ..\..\lua\src\lopcodes.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lparser.obj :  .AUTODEPEND ..\..\lua\src\lparser.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lstate.obj :  .AUTODEPEND ..\..\lua\src\lstate.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lstring.obj :  .AUTODEPEND ..\..\lua\src\lstring.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_ltable.obj :  .AUTODEPEND ..\..\lua\src\ltable.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_ltests.obj :  .AUTODEPEND ..\..\lua\src\ltests.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_ltm.obj :  .AUTODEPEND ..\..\lua\src\ltm.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lundump.obj :  .AUTODEPEND ..\..\lua\src\lundump.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lvm.obj :  .AUTODEPEND ..\..\lua\src\lvm.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lzio.obj :  .AUTODEPEND ..\..\lua\src\lzio.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lauxlib.obj :  .AUTODEPEND ..\..\lua\src\lib\lauxlib.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lbaselib.obj :  .AUTODEPEND ..\..\lua\src\lib\lbaselib.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_ldblib.obj :  .AUTODEPEND ..\..\lua\src\lib\ldblib.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_liolib.obj :  .AUTODEPEND ..\..\lua\src\lib\liolib.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lmathlib.obj :  .AUTODEPEND ..\..\lua\src\lib\lmathlib.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_loadlib.obj :  .AUTODEPEND ..\..\lua\src\lib\loadlib.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lstrlib.obj :  .AUTODEPEND ..\..\lua\src\lib\lstrlib.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_ltablib.obj :  .AUTODEPEND ..\..\lua\src\lib\ltablib.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lua.obj :  .AUTODEPEND ..\..\lua\src\lua\lua.c
! 	$(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxlua_lib_internal.obj :  .AUTODEPEND ..\..\wxlua\src\internal.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXLUA_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxlua_lib_interp.obj :  .AUTODEPEND ..\..\wxlua\src\interp.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXLUA_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxlua_lib_library.obj :  .AUTODEPEND ..\..\wxlua\src\library.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXLUA_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxlua_dll_internal.obj :  .AUTODEPEND ..\..\wxlua\src\internal.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXLUA_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxlua_dll_interp.obj :  .AUTODEPEND ..\..\wxlua\src\interp.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXLUA_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxlua_dll_library.obj :  .AUTODEPEND ..\..\wxlua\src\library.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXLUA_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_appframe.obj :  .AUTODEPEND ..\..\wxbind\src\appframe.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_clipdrag.obj :  .AUTODEPEND ..\..\wxbind\src\clipdrag.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_config.obj :  .AUTODEPEND ..\..\wxbind\src\config.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_controls.obj :  .AUTODEPEND ..\..\wxbind\src\controls.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_data.obj :  .AUTODEPEND ..\..\wxbind\src\data.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_datetime.obj :  .AUTODEPEND ..\..\wxbind\src\datetime.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_defsutil.obj :  .AUTODEPEND ..\..\wxbind\src\defsutil.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_dialogs.obj :  .AUTODEPEND ..\..\wxbind\src\dialogs.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_event.obj :  .AUTODEPEND ..\..\wxbind\src\event.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_file.obj :  .AUTODEPEND ..\..\wxbind\src\file.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_fl.obj :  .AUTODEPEND ..\..\wxbind\src\fl.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_gdi.obj :  .AUTODEPEND ..\..\wxbind\src\gdi.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_geometry.obj :  .AUTODEPEND ..\..\wxbind\src\geometry.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_grid.obj :  .AUTODEPEND ..\..\wxbind\src\grid.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_help.obj :  .AUTODEPEND ..\..\wxbind\src\help.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_html.obj :  .AUTODEPEND ..\..\wxbind\src\html.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_image.obj :  .AUTODEPEND ..\..\wxbind\src\image.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_mdi.obj :  .AUTODEPEND ..\..\wxbind\src\mdi.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_menutool.obj :  .AUTODEPEND ..\..\wxbind\src\menutool.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_plot.obj :  .AUTODEPEND ..\..\wxbind\src\plot.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_print.obj :  .AUTODEPEND ..\..\wxbind\src\print.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_regex.obj :  .AUTODEPEND ..\..\wxbind\src\regex.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_sizer.obj :  .AUTODEPEND ..\..\wxbind\src\sizer.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_socket.obj :  .AUTODEPEND ..\..\wxbind\src\socket.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_stc.obj :  .AUTODEPEND ..\..\wxbind\src\stc.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_thread.obj :  .AUTODEPEND ..\..\wxbind\src\thread.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_wave.obj :  .AUTODEPEND ..\..\wxbind\src\wave.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_windows.obj :  .AUTODEPEND ..\..\wxbind\src\windows.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_wxlhtmlwin.obj :  .AUTODEPEND ..\..\wxbind\src\wxlhtmlwin.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.obj :  .AUTODEPEND ..\..\wxbind\src\wxlprint.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_wxlua.obj :  .AUTODEPEND ..\..\wxbind\src\wxlua.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_wx_class.obj :  .AUTODEPEND ..\..\wxbind\src\wx_class.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_wx_define.obj :  .AUTODEPEND ..\..\wxbind\src\wx_define.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_wx_event.obj :  .AUTODEPEND ..\..\wxbind\src\wx_event.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_wx_object.obj :  .AUTODEPEND ..\..\wxbind\src\wx_object.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_xml.obj :  .AUTODEPEND ..\..\wxbind\src\xml.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_appframe.obj :  .AUTODEPEND ..\..\wxbind\src\appframe.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_clipdrag.obj :  .AUTODEPEND ..\..\wxbind\src\clipdrag.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_config.obj :  .AUTODEPEND ..\..\wxbind\src\config.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_controls.obj :  .AUTODEPEND ..\..\wxbind\src\controls.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_data.obj :  .AUTODEPEND ..\..\wxbind\src\data.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_datetime.obj :  .AUTODEPEND ..\..\wxbind\src\datetime.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_defsutil.obj :  .AUTODEPEND ..\..\wxbind\src\defsutil.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_dialogs.obj :  .AUTODEPEND ..\..\wxbind\src\dialogs.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_event.obj :  .AUTODEPEND ..\..\wxbind\src\event.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_file.obj :  .AUTODEPEND ..\..\wxbind\src\file.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_fl.obj :  .AUTODEPEND ..\..\wxbind\src\fl.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_gdi.obj :  .AUTODEPEND ..\..\wxbind\src\gdi.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_geometry.obj :  .AUTODEPEND ..\..\wxbind\src\geometry.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_grid.obj :  .AUTODEPEND ..\..\wxbind\src\grid.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_help.obj :  .AUTODEPEND ..\..\wxbind\src\help.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_html.obj :  .AUTODEPEND ..\..\wxbind\src\html.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_image.obj :  .AUTODEPEND ..\..\wxbind\src\image.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_mdi.obj :  .AUTODEPEND ..\..\wxbind\src\mdi.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_menutool.obj :  .AUTODEPEND ..\..\wxbind\src\menutool.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_plot.obj :  .AUTODEPEND ..\..\wxbind\src\plot.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_print.obj :  .AUTODEPEND ..\..\wxbind\src\print.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_regex.obj :  .AUTODEPEND ..\..\wxbind\src\regex.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_sizer.obj :  .AUTODEPEND ..\..\wxbind\src\sizer.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_socket.obj :  .AUTODEPEND ..\..\wxbind\src\socket.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_stc.obj :  .AUTODEPEND ..\..\wxbind\src\stc.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_thread.obj :  .AUTODEPEND ..\..\wxbind\src\thread.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_wave.obj :  .AUTODEPEND ..\..\wxbind\src\wave.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_windows.obj :  .AUTODEPEND ..\..\wxbind\src\windows.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_wxlhtmlwin.obj :  .AUTODEPEND ..\..\wxbind\src\wxlhtmlwin.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.obj :  .AUTODEPEND ..\..\wxbind\src\wxlprint.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_wxlua.obj :  .AUTODEPEND ..\..\wxbind\src\wxlua.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_wx_class.obj :  .AUTODEPEND ..\..\wxbind\src\wx_class.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_wx_define.obj :  .AUTODEPEND ..\..\wxbind\src\wx_define.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_wx_event.obj :  .AUTODEPEND ..\..\wxbind\src\wx_event.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_wx_object.obj :  .AUTODEPEND ..\..\wxbind\src\wx_object.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_xml.obj :  .AUTODEPEND ..\..\wxbind\src\xml.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxluadebug_lib_debug.obj :  .AUTODEPEND ..\..\wxluadebug\src\debug.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXLUADEBUG_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxluadebug_lib_splttree.obj :  .AUTODEPEND ..\..\wxluadebug\src\splttree.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXLUADEBUG_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxluadebug_lib_staktree.obj :  .AUTODEPEND ..\..\wxluadebug\src\staktree.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXLUADEBUG_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxluadebug_dll_debug.obj :  .AUTODEPEND ..\..\wxluadebug\src\debug.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXLUADEBUG_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxluadebug_dll_splttree.obj :  .AUTODEPEND ..\..\wxluadebug\src\splttree.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXLUADEBUG_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxluadebug_dll_staktree.obj :  .AUTODEPEND ..\..\wxluadebug\src\staktree.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXLUADEBUG_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxluasocket_lib_debugio.obj :  .AUTODEPEND ..\..\wxluasocket\src\debugio.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxluasocket_lib_dserver.obj :  .AUTODEPEND ..\..\wxluasocket\src\dserver.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxluasocket_lib_dtarget.obj :  .AUTODEPEND ..\..\wxluasocket\src\dtarget.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxluasocket_lib_socket.obj :  .AUTODEPEND ..\..\wxluasocket\src\socket.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxluasocket_dll_debugio.obj :  .AUTODEPEND ..\..\wxluasocket\src\debugio.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxluasocket_dll_dserver.obj :  .AUTODEPEND ..\..\wxluasocket\src\dserver.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxluasocket_dll_dtarget.obj :  .AUTODEPEND ..\..\wxluasocket\src\dtarget.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxluasocket_dll_socket.obj :  .AUTODEPEND ..\..\wxluasocket\src\socket.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $<
  
--- 491,854 ----
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lapi.obj :  .AUTODEPEND ..\..\lua\src\lapi.c
! 	$(CC) -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lcode.obj :  .AUTODEPEND ..\..\lua\src\lcode.c
! 	$(CC) -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_ldebug.obj :  .AUTODEPEND ..\..\lua\src\ldebug.c
! 	$(CC) -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_ldo.obj :  .AUTODEPEND ..\..\lua\src\ldo.c
! 	$(CC) -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_ldump.obj :  .AUTODEPEND ..\..\lua\src\ldump.c
! 	$(CC) -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lfunc.obj :  .AUTODEPEND ..\..\lua\src\lfunc.c
! 	$(CC) -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lgc.obj :  .AUTODEPEND ..\..\lua\src\lgc.c
! 	$(CC) -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_llex.obj :  .AUTODEPEND ..\..\lua\src\llex.c
! 	$(CC) -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lmem.obj :  .AUTODEPEND ..\..\lua\src\lmem.c
! 	$(CC) -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lobject.obj :  .AUTODEPEND ..\..\lua\src\lobject.c
! 	$(CC) -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lopcodes.obj :  .AUTODEPEND ..\..\lua\src\lopcodes.c
! 	$(CC) -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lparser.obj :  .AUTODEPEND ..\..\lua\src\lparser.c
! 	$(CC) -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lstate.obj :  .AUTODEPEND ..\..\lua\src\lstate.c
! 	$(CC) -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lstring.obj :  .AUTODEPEND ..\..\lua\src\lstring.c
! 	$(CC) -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_ltable.obj :  .AUTODEPEND ..\..\lua\src\ltable.c
! 	$(CC) -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_ltests.obj :  .AUTODEPEND ..\..\lua\src\ltests.c
! 	$(CC) -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_ltm.obj :  .AUTODEPEND ..\..\lua\src\ltm.c
! 	$(CC) -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lundump.obj :  .AUTODEPEND ..\..\lua\src\lundump.c
! 	$(CC) -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lvm.obj :  .AUTODEPEND ..\..\lua\src\lvm.c
! 	$(CC) -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lzio.obj :  .AUTODEPEND ..\..\lua\src\lzio.c
! 	$(CC) -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lauxlib.obj :  .AUTODEPEND ..\..\lua\src\lib\lauxlib.c
! 	$(CC) -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lbaselib.obj :  .AUTODEPEND ..\..\lua\src\lib\lbaselib.c
! 	$(CC) -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_ldblib.obj :  .AUTODEPEND ..\..\lua\src\lib\ldblib.c
! 	$(CC) -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_liolib.obj :  .AUTODEPEND ..\..\lua\src\lib\liolib.c
! 	$(CC) -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lmathlib.obj :  .AUTODEPEND ..\..\lua\src\lib\lmathlib.c
! 	$(CC) -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_loadlib.obj :  .AUTODEPEND ..\..\lua\src\lib\loadlib.c
! 	$(CC) -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_lstrlib.obj :  .AUTODEPEND ..\..\lua\src\lib\lstrlib.c
! 	$(CC) -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lib_ltablib.obj :  .AUTODEPEND ..\..\lua\src\lib\ltablib.c
! 	$(CC) -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\mod_lua_lua.obj :  .AUTODEPEND ..\..\lua\src\lua\lua.c
! 	$(CC) -zq -fo=$^@ $(MOD_LUA_CFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxlua_lib_internal.obj :  .AUTODEPEND ..\..\wxlua\src\internal.cpp
! 	$(CXX) -zq -fo=$^@ $(WXLUA_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxlua_lib_interp.obj :  .AUTODEPEND ..\..\wxlua\src\interp.cpp
! 	$(CXX) -zq -fo=$^@ $(WXLUA_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxlua_lib_library.obj :  .AUTODEPEND ..\..\wxlua\src\library.cpp
! 	$(CXX) -zq -fo=$^@ $(WXLUA_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxlua_dll_internal.obj :  .AUTODEPEND ..\..\wxlua\src\internal.cpp
! 	$(CXX) -zq -fo=$^@ $(WXLUA_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxlua_dll_interp.obj :  .AUTODEPEND ..\..\wxlua\src\interp.cpp
! 	$(CXX) -zq -fo=$^@ $(WXLUA_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxlua_dll_library.obj :  .AUTODEPEND ..\..\wxlua\src\library.cpp
! 	$(CXX) -zq -fo=$^@ $(WXLUA_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_appframe.obj :  .AUTODEPEND ..\..\wxbind\src\appframe.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_clipdrag.obj :  .AUTODEPEND ..\..\wxbind\src\clipdrag.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_config.obj :  .AUTODEPEND ..\..\wxbind\src\config.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_controls.obj :  .AUTODEPEND ..\..\wxbind\src\controls.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_data.obj :  .AUTODEPEND ..\..\wxbind\src\data.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_datetime.obj :  .AUTODEPEND ..\..\wxbind\src\datetime.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_defsutil.obj :  .AUTODEPEND ..\..\wxbind\src\defsutil.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_dialogs.obj :  .AUTODEPEND ..\..\wxbind\src\dialogs.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_event.obj :  .AUTODEPEND ..\..\wxbind\src\event.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_file.obj :  .AUTODEPEND ..\..\wxbind\src\file.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_fl.obj :  .AUTODEPEND ..\..\wxbind\src\fl.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_gdi.obj :  .AUTODEPEND ..\..\wxbind\src\gdi.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_geometry.obj :  .AUTODEPEND ..\..\wxbind\src\geometry.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_grid.obj :  .AUTODEPEND ..\..\wxbind\src\grid.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_help.obj :  .AUTODEPEND ..\..\wxbind\src\help.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_html.obj :  .AUTODEPEND ..\..\wxbind\src\html.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_image.obj :  .AUTODEPEND ..\..\wxbind\src\image.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_mdi.obj :  .AUTODEPEND ..\..\wxbind\src\mdi.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_menutool.obj :  .AUTODEPEND ..\..\wxbind\src\menutool.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_plot.obj :  .AUTODEPEND ..\..\wxbind\src\plot.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_print.obj :  .AUTODEPEND ..\..\wxbind\src\print.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_regex.obj :  .AUTODEPEND ..\..\wxbind\src\regex.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_sizer.obj :  .AUTODEPEND ..\..\wxbind\src\sizer.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_socket.obj :  .AUTODEPEND ..\..\wxbind\src\socket.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_stc.obj :  .AUTODEPEND ..\..\wxbind\src\stc.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_thread.obj :  .AUTODEPEND ..\..\wxbind\src\thread.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_wave.obj :  .AUTODEPEND ..\..\wxbind\src\wave.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_windows.obj :  .AUTODEPEND ..\..\wxbind\src\windows.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_wxlhtmlwin.obj :  .AUTODEPEND ..\..\wxbind\src\wxlhtmlwin.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.obj :  .AUTODEPEND ..\..\wxbind\src\wxlprint.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_wxlua.obj :  .AUTODEPEND ..\..\wxbind\src\wxlua.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_wx_class.obj :  .AUTODEPEND ..\..\wxbind\src\wx_class.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_wx_define.obj :  .AUTODEPEND ..\..\wxbind\src\wx_define.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_wx_event.obj :  .AUTODEPEND ..\..\wxbind\src\wx_event.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_wx_object.obj :  .AUTODEPEND ..\..\wxbind\src\wx_object.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_lib_xml.obj :  .AUTODEPEND ..\..\wxbind\src\xml.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_appframe.obj :  .AUTODEPEND ..\..\wxbind\src\appframe.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_clipdrag.obj :  .AUTODEPEND ..\..\wxbind\src\clipdrag.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_config.obj :  .AUTODEPEND ..\..\wxbind\src\config.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_controls.obj :  .AUTODEPEND ..\..\wxbind\src\controls.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_data.obj :  .AUTODEPEND ..\..\wxbind\src\data.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_datetime.obj :  .AUTODEPEND ..\..\wxbind\src\datetime.cpp
! 	$(CXX) -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\wxbind_dll_defsutil.obj :  .AUTODEPEND ..\..\wxbind\src\defsutil.cpp
! 	$(CXX) -zq -...
 
[truncated message content]

[Wxlua-commit] wxLua/apps/build/msw makefile.bcc,1.6,1.7 makefile.gcc,1.6,1.7 makefile.vc,1.4,1.5 makefile.wat,1.6,1.7

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

Update of /cvsroot/wxlua/wxLua/apps/build/msw
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25784/wxLua/apps/build/msw

Modified Files:
	makefile.bcc makefile.gcc makefile.vc makefile.wat 
Log Message:
rebaked the build files to remove the unused wxluawrap.cpp file
started docs for building wxlua


Index: makefile.vc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** makefile.vc	20 Nov 2005 11:35:17 -0000	1.4
--- makefile.vc	23 Nov 2005 06:03:40 -0000	1.5
***************
*** 11,23 ****
  # -------------------------------------------------------------------------
  
- # C compiler 
- CC = cl
- 
  # C++ compiler 
  CXX = cl
  
- # Standard flags for CC 
- CFLAGS = 
- 
  # Standard flags for C++ 
  CXXFLAGS = 
--- 11,17 ----
***************
*** 44,50 ****
  WX_VERSION = 26
  
- # Use monolithic build of wxWidgets? [0,1]
- WX_MONOLITHIC = 0
- 
  
  
--- 38,41 ----
***************
*** 55,64 ****
  ### Variables: ###
  
- APP_WXLUA_CFLAGS = /MD$(__DEBUGRUNTIME_7) /DWIN32 $(__WXUNICODE_DEFINE_p) \
- 	$(__WXDEBUG_DEFINE_p) /D__WXMSW__ \
- 	/I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \
- 	/I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS_2) $(__OPTIMIZEFLAG_3) \
- 	$(__DEBUGINFO_4) /Fd..\..\..\bin\wxlua.pdb $(____DEBUGRUNTIME_6_p) \
- 	$(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CFLAGS)
  APP_WXLUA_CXXFLAGS = /MD$(__DEBUGRUNTIME_7) /DWIN32 $(__WXUNICODE_DEFINE_p) \
  	$(__WXDEBUG_DEFINE_p) /D__WXMSW__ \
--- 46,49 ----
***************
*** 70,75 ****
  	msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \
  	msvc$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj \
! 	msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res \
! 	msvc$(WXLIBPOSTFIX)\app_wxlua_wxluawrap.obj
  
  ### Conditionally set variables: ###
--- 55,59 ----
  	msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \
  	msvc$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj \
! 	msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
  
  ### Conditionally set variables: ###
***************
*** 144,207 ****
  __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\vc_dll
  !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib
- !endif
  !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1"
  WXLIBPOSTFIX = u
--- 128,131 ----
***************
*** 239,243 ****
  ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
  	link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_5)  /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<<
! 	$(APP_WXLUA_OBJECTS)  wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib $(__WXLIB_ADV_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib
  <<
  
--- 163,167 ----
  ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
  	link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_5)  /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<<
! 	$(APP_WXLUA_OBJECTS)  wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib
  <<
  
***************
*** 251,255 ****
  	rc /fo$@  /d WIN32 $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include /i ..\..\..\modules $(____DEBUGRUNTIME_6_p_1) $(__WX_SHAREDDEFINE_p_1) $**
  
- msvc$(WXLIBPOSTFIX)\app_wxlua_wxluawrap.obj: ..\..\..\bindings\wxwidgets\wxluawrap.c
- 	$(CC) /c /nologo /TC /Fo$@ $(APP_WXLUA_CFLAGS) $**
- 
--- 175,176 ----

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** makefile.bcc	20 Nov 2005 11:35:17 -0000	1.6
--- makefile.bcc	23 Nov 2005 06:03:40 -0000	1.7
***************
*** 20,28 ****
  # -------------------------------------------------------------------------
  
- # C compiler 
- !ifndef CC
- CC = bcc32
- !endif
- 
  # C++ compiler 
  !ifndef CXX
--- 20,23 ----
***************
*** 30,38 ****
  !endif
  
- # Standard flags for CC 
- !ifndef CFLAGS
- CFLAGS = 
- !endif
- 
  # Standard flags for C++ 
  !ifndef CXXFLAGS
--- 25,28 ----
***************
*** 75,83 ****
  !endif
  
- # Use monolithic build of wxWidgets? [0,1]
- !ifndef WX_MONOLITHIC
- WX_MONOLITHIC = 0
- !endif
- 
  
  
--- 65,68 ----
***************
*** 88,96 ****
  ### Variables: ###
  
- APP_WXLUA_CFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \
- 	$(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
- 	-I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \
- 	-I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG_1) $(__DEBUGINFO) \
- 	-tWM $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CFLAGS)
  APP_WXLUA_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \
  	$(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
--- 73,76 ----
***************
*** 100,105 ****
  APP_WXLUA_OBJECTS =  \
  	borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \
! 	borland$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj \
! 	borland$(WXLIBPOSTFIX)\app_wxlua_wxluawrap.obj
  
  ### Conditionally set variables: ###
--- 80,84 ----
  APP_WXLUA_OBJECTS =  \
  	borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \
! 	borland$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj
  
  ### Conditionally set variables: ###
***************
*** 138,201 ****
  __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_dll
  !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib
- !endif
- !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib
- !endif
- !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1"
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib
- !endif
  !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1"
  WXLIBPOSTFIX = u
--- 117,120 ----
***************
*** 242,246 ****
  ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS)  borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
  	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO)  -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&|
! 	c0x32.obj $(APP_WXLUA_OBJECTS),$@,, wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib $(__WXLIB_ADV_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
  |
  
--- 161,165 ----
  ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS)  borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
  	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO)  -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&|
! 	c0x32.obj $(APP_WXLUA_OBJECTS),$@,, wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
  |
  
***************
*** 254,258 ****
  	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules $(__WX_SHAREDDEFINE_p_1) $**
  
- borland$(WXLIBPOSTFIX)\app_wxlua_wxluawrap.obj: ..\..\..\bindings\wxwidgets\wxluawrap.c
- 	$(CC) -q -c -P- -o$@ $(APP_WXLUA_CFLAGS) $**
- 
--- 173,174 ----

Index: makefile.wat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** makefile.wat	20 Nov 2005 11:35:17 -0000	1.6
--- makefile.wat	23 Nov 2005 06:03:40 -0000	1.7
***************
*** 11,23 ****
  # -------------------------------------------------------------------------
  
- # C compiler 
- CC = wcc386
- 
  # C++ compiler 
  CXX = wpp386
  
- # Standard flags for CC 
- CFLAGS = 
- 
  # Standard flags for C++ 
  CXXFLAGS = 
--- 11,17 ----
***************
*** 44,50 ****
  WX_VERSION = 26
  
- # Use monolithic build of wxWidgets? [0,1]
- WX_MONOLITHIC = 0
- 
  
  
--- 38,41 ----
***************
*** 109,256 ****
  __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\wat_dll
  !endif
- __WXLIB_ADV_NAME_p =
- !ifeq WX_DEBUG 0
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 0
- __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 0
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 1
- __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 1
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 0
- __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 1
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 1
- __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib
- !endif
- !endif
- !endif
- __WXLIB_XML_NAME_p =
- !ifeq WX_DEBUG 0
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 0
- __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 0
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 1
- __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 1
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 0
- __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 1
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 1
- __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib
- !endif
- !endif
- !endif
- __WXLIB_CORE_NAME_p =
- !ifeq WX_DEBUG 0
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 0
- __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 0
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 1
- __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 1
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 0
- __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 1
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 1
- __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib
- !endif
- !endif
- !endif
- __WXLIB_BASE_NAME_p =
- !ifeq WX_DEBUG 0
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 0
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 1
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 0
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 0
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 1
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 1
- !ifeq WX_MONOLITHIC 0
- !ifeq WX_UNICODE 1
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 0
- !ifeq WX_MONOLITHIC 1
- !ifeq WX_UNICODE 0
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 1
- !ifeq WX_MONOLITHIC 1
- !ifeq WX_UNICODE 0
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 0
- !ifeq WX_MONOLITHIC 1
- !ifeq WX_UNICODE 1
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib
- !endif
- !endif
- !endif
- !ifeq WX_DEBUG 1
- !ifeq WX_MONOLITHIC 1
- !ifeq WX_UNICODE 1
- __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib
- !endif
- !endif
- !endif
  __WXUNICODE_DEFINE_p =
  !ifeq WX_UNICODE 1
--- 100,103 ----
***************
*** 291,299 ****
  ### Variables: ###
  
- APP_WXLUA_CFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ &
- 	-i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) &
- 	-i=$(WX_DIR)\include -i=..\..\..\modules $(__WARNINGS_0) &
- 	$(__OPTIMIZEFLAG_1) $(__DEBUGINFO_2) -bm $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) &
- 	$(CFLAGS)
  APP_WXLUA_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ &
  	-i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) &
--- 138,141 ----
***************
*** 303,308 ****
  APP_WXLUA_OBJECTS =  &
  	watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj &
! 	watcom$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj &
! 	watcom$(WXLIBPOSTFIX)\app_wxlua_wxluawrap.obj
  
  
--- 145,149 ----
  APP_WXLUA_OBJECTS =  &
  	watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj &
! 	watcom$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj
  
  
***************
*** 330,347 ****
  	@%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_3)  libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES)
  	@for %i in ($(APP_WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc file %i
! 	@for %i in ( wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib $(__WXLIB_ADV_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc library %i
  	@%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc option resource=watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
  	wlink @watcom$(WXLIBPOSTFIX)\app_wxlua.lbc
  
  watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj :  .AUTODEPEND ..\..\wxlua\src\wxlua.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUA_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj :  .AUTODEPEND ..\..\wxlua\src\lconsole.cpp
! 	$(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUA_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.res :  .AUTODEPEND ..\..\wxlua\src\wxlua.rc
  	wrc -q -ad -bt=nt -r -fo=$^@ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules $(__WX_SHAREDDEFINE_p) $<
  
- watcom$(WXLIBPOSTFIX)\app_wxlua_wxluawrap.obj :  .AUTODEPEND ..\..\..\bindings\wxwidgets\wxluawrap.c
- 	$(CC) -bt=nt -zq -fo=$^@ $(APP_WXLUA_CFLAGS) $<
- 
--- 171,185 ----
  	@%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_3)  libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES)
  	@for %i in ($(APP_WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc file %i
! 	@for %i in ( wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc library %i
  	@%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc option resource=watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
  	wlink @watcom$(WXLIBPOSTFIX)\app_wxlua.lbc
  
  watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj :  .AUTODEPEND ..\..\wxlua\src\wxlua.cpp
! 	$(CXX) -zq -fo=$^@ $(APP_WXLUA_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj :  .AUTODEPEND ..\..\wxlua\src\lconsole.cpp
! 	$(CXX) -zq -fo=$^@ $(APP_WXLUA_CXXFLAGS) $<
  
  watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.res :  .AUTODEPEND ..\..\wxlua\src\wxlua.rc
  	wrc -q -ad -bt=nt -r -fo=$^@ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules $(__WX_SHAREDDEFINE_p) $<
  

Index: makefile.gcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** makefile.gcc	20 Nov 2005 11:35:17 -0000	1.6
--- makefile.gcc	23 Nov 2005 06:03:40 -0000	1.7
***************
*** 11,23 ****
  # -------------------------------------------------------------------------
  
- # C compiler 
- CC = gcc
- 
  # C++ compiler 
  CXX = g++
  
- # Standard flags for CC 
- CFLAGS = 
- 
  # Standard flags for C++ 
  CXXFLAGS = 
--- 11,17 ----
***************
*** 44,50 ****
  WX_VERSION = 26
  
- # Use monolithic build of wxWidgets? [0,1]
- WX_MONOLITHIC = 0
- 
  
  
--- 38,41 ----
***************
*** 56,64 ****
  
  CPPDEPS = -MT$@ -MF$@.d -MD
- APP_WXLUA_CFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \
- 	$(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
- 	-I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include \
- 	-I..\..\..\modules $(__WARNINGS_0) $(__OPTIMIZEFLAG_1) $(__DEBUGINFO) \
- 	-mthreads $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CFLAGS)
  APP_WXLUA_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \
  	$(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
--- 47,50 ----
***************
*** 69,74 ****
  	mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua.o \
  	mingw$(WXLIBPOSTFIX)\app_wxlua_lconsole.o \
! 	mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o \
! 	mingw$(WXLIBPOSTFIX)\app_wxlua_wxluawrap.o
  
  ### Conditionally set variables: ###
--- 55,59 ----
  	mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua.o \
  	mingw$(WXLIBPOSTFIX)\app_wxlua_lconsole.o \
! 	mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o
  
  ### Conditionally set variables: ###
***************
*** 114,257 ****
  endif
  ifeq ($(WX_DEBUG),0)
- ifeq ($(WX_MONOLITHIC),0)
- ifeq ($(WX_UNICODE),0)
- __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)_adv
- endif
- endif
- endif
- ifeq ($(WX_DEBUG),0)
- ifeq ($(WX_MONOLITHIC),0)
- ifeq ($(WX_UNICODE),1)
- __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)u_adv
- endif
- endif
- endif
- ifeq ($(WX_DEBUG),1)
- ifeq ($(WX_MONOLITHIC),0)
- ifeq ($(WX_UNICODE),0)
- __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)d_adv
- endif
- endif
- endif
- ifeq ($(WX_DEBUG),1)
- ifeq ($(WX_MONOLITHIC),0)
- ifeq ($(WX_UNICODE),1)
- __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)ud_adv
- endif
- endif
- endif
- ifeq ($(WX_DEBUG),0)
- ifeq ($(WX_MONOLITHIC),0)
- ifeq ($(WX_UNICODE),0)
- __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)_xml
- endif
- endif
- endif
- ifeq ($(WX_DEBUG),0)
- ifeq ($(WX_MONOLITHIC),0)
- ifeq ($(WX_UNICODE),1)
- __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)u_xml
- endif
- endif
- endif
- ifeq ($(WX_DEBUG),1)
- ifeq ($(WX_MONOLITHIC),0)
- ifeq ($(WX_UNICODE),0)
- __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)d_xml
- endif
- endif
- endif
- ifeq ($(WX_DEBUG),1)
- ifeq ($(WX_MONOLITHIC),0)
- ifeq ($(WX_UNICODE),1)
- __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)ud_xml
- endif
- endif
- endif
- ifeq ($(WX_DEBUG),0)
- ifeq ($(WX_MONOLITHIC),0)
- ifeq ($(WX_UNICODE),0)
- __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)_core
- endif
- endif
- endif
- ifeq ($(WX_DEBUG),0)
- ifeq ($(WX_MONOLITHIC),0)
- ifeq ($(WX_UNICODE),1)
- __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)u_core
- endif
- endif
- endif
- ifeq ($(WX_DEBUG),1)
- ifeq ($(WX_MONOLITHIC),0)
- ifeq ($(WX_UNICODE),0)
- __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)d_core
- endif
- endif
- endif
- ifeq ($(WX_DEBUG),1)
- ifeq ($(WX_MONOLITHIC),0)
- ifeq ($(WX_UNICODE),1)
- __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)ud_core
- endif
- endif
- endif
- ifeq ($(WX_DEBUG),0)
- ifeq ($(WX_MONOLITHIC),0)
- ifeq ($(WX_UNICODE),0)
- __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)
- endif
- endif
- endif
- ifeq ($(WX_DEBUG),1)
- ifeq ($(WX_MONOLITHIC),0)
- ifeq ($(WX_UNICODE),0)
- __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)d
- endif
- endif
- endif
- ifeq ($(WX_DEBUG),0)
- ifeq ($(WX_MONOLITHIC),0)
- ifeq ($(WX_UNICODE),1)
- __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)u
- endif
- endif
- endif
- ifeq ($(WX_DEBUG),1)
- ifeq ($(WX_MONOLITHIC),0)
- ifeq ($(WX_UNICODE),1)
- __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)ud
- endif
- endif
- endif
- ifeq ($(WX_DEBUG),0)
- ifeq ($(WX_MONOLITHIC),1)
- ifeq ($(WX_UNICODE),0)
- __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)
- endif
- endif
- endif
- ifeq ($(WX_DEBUG),1)
- ifeq ($(WX_MONOLITHIC),1)
- ifeq ($(WX_UNICODE),0)
- __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)d
- endif
- endif
- endif
- ifeq ($(WX_DEBUG),0)
- ifeq ($(WX_MONOLITHIC),1)
- ifeq ($(WX_UNICODE),1)
- __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)u
- endif
- endif
- endif
- ifeq ($(WX_DEBUG),1)
- ifeq ($(WX_MONOLITHIC),1)
- ifeq ($(WX_UNICODE),1)
- __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)ud
- endif
- endif
- endif
- ifeq ($(WX_DEBUG),0)
  ifeq ($(WX_UNICODE),1)
  WXLIBPOSTFIX = u
--- 99,102 ----
***************
*** 296,300 ****
  
  ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o
! 	$(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES)  -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua $(__WXLIB_ADV_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
  
  mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua.o: ../../wxlua/src/wxlua.cpp
--- 141,145 ----
  
  ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o
! 	$(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES)  -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
  
  mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua.o: ../../wxlua/src/wxlua.cpp
***************
*** 307,313 ****
  	windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ..\..\..\modules $(__WX_SHAREDDEFINE_p_1)
  
- mingw$(WXLIBPOSTFIX)\app_wxlua_wxluawrap.o: ../../../bindings/wxwidgets/wxluawrap.c
- 	$(CC) -c -o $@ $(APP_WXLUA_CFLAGS) $(CPPDEPS) $<
- 
  .PHONY: all clean
  
--- 152,155 ----

[Wxlua-commit] wxLua/util Makefile.in,1.4,1.5

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

Update of /cvsroot/wxlua/wxLua/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25784/wxLua/util

Modified Files:
	Makefile.in 
Log Message:
rebaked the build files to remove the unused wxluawrap.cpp file
started docs for building wxlua


Index: Makefile.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/util/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.in	20 Nov 2005 11:35:18 -0000	1.4
--- Makefile.in	23 Nov 2005 06:03:40 -0000	1.5
***************
*** 32,36 ****
  @COND_USE_BIN2C_1@__util_bin2c___depname = ./../bin/bin2c$(EXEEXT)
  @COND_PLATFORM_MAC_1@__util_bin2c___mac_setfilecmd = \
! @COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL ./../bin/bin2c$(EXEEXT)
  
  ### Targets: ###
--- 32,36 ----
  @COND_USE_BIN2C_1@__util_bin2c___depname = ./../bin/bin2c$(EXEEXT)
  @COND_PLATFORM_MAC_1@__util_bin2c___mac_setfilecmd = \
! @COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL bin2c$(EXEEXT)
  
  ### Targets: ###

[Wxlua-commit] wxLua/modules Makefile.in,1.7,1.8

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

Update of /cvsroot/wxlua/wxLua/modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25784/wxLua/modules

Modified Files:
	Makefile.in 
Log Message:
rebaked the build files to remove the unused wxluawrap.cpp file
started docs for building wxlua


Index: Makefile.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.in	20 Nov 2005 12:11:48 -0000	1.7
--- Makefile.in	23 Nov 2005 06:03:40 -0000	1.8
***************
*** 191,195 ****
  @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
  @COND_PLATFORM_MAC_1@__mod_lua___mac_setfilecmd = \
! @COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL ./../bin/lua$(EXEEXT)
  @COND_WX_SHARED_0@__wxlua_lib___depname = \
  @COND_WX_SHARED_0@	./../lib/$(LIBPREFIX)wxlua$(LIBEXT)
--- 191,195 ----
  @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
  @COND_PLATFORM_MAC_1@__mod_lua___mac_setfilecmd = \
! @COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL lua$(EXEEXT)
  @COND_WX_SHARED_0@__wxlua_lib___depname = \
  @COND_WX_SHARED_0@	./../lib/$(LIBPREFIX)wxlua$(LIBEXT)

[Wxlua-commit] wxLua/apps Makefile.in,1.5,1.6

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

Update of /cvsroot/wxlua/wxLua/apps
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25784/wxLua/apps

Modified Files:
	Makefile.in 
Log Message:
rebaked the build files to remove the unused wxluawrap.cpp file
started docs for building wxlua


Index: Makefile.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.in	20 Nov 2005 11:35:17 -0000	1.5
--- Makefile.in	23 Nov 2005 06:03:39 -0000	1.6
***************
*** 15,25 ****
  SETFILE = @SETFILE@
  top_builddir = @top_builddir@
- CC = @CC@
  CXX = @CXX@
- CFLAGS = @CFLAGS@
  CXXFLAGS = @CXXFLAGS@
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
- WX_CFLAGS = @WX_CFLAGS@
  WX_CXXFLAGS = @WX_CXXFLAGS@
  WX_LIBS = @WX_LIBS@
--- 15,22 ----
***************
*** 28,47 ****
  
  DESTDIR = 
- APP_WXLUA_CFLAGS =  -I../modules   $(WX_CFLAGS) $(CPPFLAGS) $(CFLAGS)
  APP_WXLUA_CXXFLAGS =  -I../modules   $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUA_OBJECTS =  \
  	app_wxlua_wxlua.o \
  	app_wxlua_lconsole.o \
! 	$(__app_wxlua___win32rc) \
! 	app_wxlua_..\bindings\wxwidgets\wxluawrap.o
  
  ### Conditionally set variables: ###
  
- @COND_DEPS_TRACKING_0@CCC = $(CC)
- @COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)
- @COND_DEPS_TRACKING_0@CXXC = $(CXX)
  @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
  @COND_PLATFORM_MAC_1@__app_wxlua___mac_setfilecmd = \
! @COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL ../bin/wxlua$(EXEEXT)
  @COND_PLATFORM_WIN32_1@__app_wxlua___win32rc = app_wxlua_wxlua_rc.o
  
--- 25,40 ----
  
  DESTDIR = 
  APP_WXLUA_CXXFLAGS =  -I../modules   $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUA_OBJECTS =  \
  	app_wxlua_wxlua.o \
  	app_wxlua_lconsole.o \
! 	$(__app_wxlua___win32rc)
  
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+ @COND_DEPS_TRACKING_0@CXXC = $(CXX)
  @COND_PLATFORM_MAC_1@__app_wxlua___mac_setfilecmd = \
! @COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL wxlua$(EXEEXT)
  @COND_PLATFORM_WIN32_1@__app_wxlua___win32rc = app_wxlua_wxlua_rc.o
  
***************
*** 65,69 ****
  
  ../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc)
! 	$(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L../lib  -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua $(WX_LIBS)
  	
  	$(__app_wxlua___mac_setfilecmd)
--- 58,62 ----
  
  ../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc)
! 	$(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L../lib  $(WX_LIBS) -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua
  	
  	$(__app_wxlua___mac_setfilecmd)
***************
*** 78,84 ****
  	$(RESCOMP) -i$< -o$@ --include-dir ../modules
  
- app_wxlua_..\bindings\wxwidgets\wxluawrap.o: ./..\bindings\wxwidgets\wxluawrap.c
- 	$(CCC) -c -o $@ $(APP_WXLUA_CFLAGS) ./..\bindings\wxwidgets\wxluawrap.c
- 
  
  # Include dependency info, if present:
--- 71,74 ----

[Wxlua-commit] wxLua/bindings/wxwidgets wave.i,1.3,1.4 windows.i,1.5,1.6

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

Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19201/wxLua/bindings/wxwidgets

Modified Files:
	wave.i windows.i 
Log Message:
update to more depricated wx27 stuff


Index: windows.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** windows.i	20 Nov 2005 04:09:46 -0000	1.5
--- windows.i	21 Nov 2005 23:42:59 -0000	1.6
***************
*** 216,225 ****
  
  %define wxNB_FIXEDWIDTH
- %wxchkver23 %define wxNB_TOP
- %define wxNB_LEFT
- %define wxNB_RIGHT
- %define wxNB_BOTTOM
  %wxchkver23 %define wxNB_MULTILINE
  
  %typedef wxNotebookPage wxWindow
  
--- 216,231 ----
  
  %define wxNB_FIXEDWIDTH
  %wxchkver23 %define wxNB_MULTILINE
  
+ %wxchkver23&(!%wxchkver27|%wxcompat26) %define wxNB_TOP
+ !%wxchkver27|%wxcompat26 %define wxNB_LEFT
+ !%wxchkver27|%wxcompat26 %define wxNB_RIGHT
+ !%wxchkver27|%wxcompat26 %define wxNB_BOTTOM
+ 
+ %wxchkver27 %define wxBK_TOP
+ %wxchkver27 %define wxBK_LEFT
+ %wxchkver27 %define wxBK_RIGHT
+ %wxchkver27 %define wxBK_BOTTOM
+ 
  %typedef wxNotebookPage wxWindow
  

Index: wave.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wave.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wave.i	1 Aug 2005 19:43:33 -0000	1.3
--- wave.i	21 Nov 2005 23:42:59 -0000	1.4
***************
*** 4,14 ****
  %if wxLUA_USE_wxWave
  
  %win %define wxSOUND_SYNC
  %win %define wxSOUND_ASYNC
  %win %define wxSOUND_LOOP
  
- %if %msw&!%wxchkver25
- %include "wx/wave.h"
- 
  %class %delete %noclassinfo wxWave, wxObject
      wxWave(const wxString& fileName, bool isResource = FALSE)
--- 4,15 ----
  %if wxLUA_USE_wxWave
  
+ %if %msw&!%wxchkver25
+ %if wxUSE_WAVE
+ %include "wx/wave.h"
+ 
  %win %define wxSOUND_SYNC
  %win %define wxSOUND_ASYNC
  %win %define wxSOUND_LOOP
  
  %class %delete %noclassinfo wxWave, wxObject
      wxWave(const wxString& fileName, bool isResource = FALSE)
***************
*** 19,25 ****
      %wxchkver25 bool Play(unsigned int flags = wxSOUND_ASYNC) const
  %endclass
- %endif
  
! // FIXME add wxSound for >2.5
  
  %endif wxLUA_USE_wxWave
--- 20,53 ----
      %wxchkver25 bool Play(unsigned int flags = wxSOUND_ASYNC) const
  %endclass
  
! %endif // wxUSE_WAVE
! %endif // %msw&!%wxchkver25
! 
! // ----------------------------------------------------------------------------
! 
! %if %wxchkver26
! %if wxUSE_SOUND
! %include "wx/sound.h"
! 
! %define wxSOUND_SYNC
! %define wxSOUND_ASYNC
! %define wxSOUND_LOOP
! 
! %class %delete %noclassinfo wxSound, wxObject
!     %constructor wxSoundDefault()
!     wxSound(const wxString& fileName, bool isResource = false)
!     //wxSound(int size, const wxByte* data)
! 
!     bool Create(const wxString& fileName, bool isResource = false)
!     //%rename CreateFromData bool Create(int size, const wxByte* data)
!     bool IsOk() const
!     bool Play(unsigned int flags = wxSOUND_ASYNC) const
!     //%wxcompat24 bool Play(bool async, bool looped = false) const
!     %rename PlayFile static bool Play(const wxString& filename, unsigned flags = wxSOUND_ASYNC)
!     static void Stop()
! %endclass
! 
! %endif // wxUSE_SOUND
! %endif // %wxchkver26
  
  %endif wxLUA_USE_wxWave