Skip to content
This repository was archived by the owner on Feb 20, 2024. It is now read-only.

Port Sqplus to sqrat #5

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Port Sqplus to sqrat #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
f2a2279
[NOT COMPILE] Update Squirrel
bluehazzard Apr 24, 2016
b7e0af3
[NOT COMPILE] Remove sqplus
bluehazzard Apr 24, 2016
e75ebbd
[NOT COMPILE] Add sqrat binding library
bluehazzard Apr 24, 2016
63d2f5d
[NOT COMPILE] Add a c++ wrapper around the squirrel c-api vm to make …
bluehazzard May 24, 2016
c26cb4e
[NOT COMPILE] Change cb internals squirrel binding from sqplus to sqr…
bluehazzard May 24, 2016
6906a34
[NOT COMPILE] Change cb internals squirrel binding from sqplus to sqr…
bluehazzard May 24, 2016
2814010
[NOT COMPILE] change all wx from sqplus to sqrat
bluehazzard May 24, 2016
9a6ff67
[NOT COMPILE] update scripting console to work with sqrat, add colors…
bluehazzard May 24, 2016
7410010
[NOT COMPILE] update all codeblocks main application bindings
bluehazzard May 24, 2016
c163f85
[NOT COMPILE] change sdk related binding (3/3)
bluehazzard May 24, 2016
77c1e3e
Update Project files
bluehazzard May 24, 2016
0a7ee1b
Fix scripting wiz to work with sqrat
bluehazzard May 12, 2016
07c9cf3
Fix debugger plugin to work with the sqrat binding
bluehazzard May 11, 2016
a897f92
Fix compiler gcc plugin
bluehazzard May 10, 2016
8e780c7
Make cbbreciations plugin compatible with sqrat
bluehazzard May 10, 2016
9423445
Add test scripts for squirrel wx and cb internals
bluehazzard May 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
206 changes: 120 additions & 86 deletions src/CodeBlocks-unix.cbp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
<Option compiler="gcc" />
<Compiler>
<Add option="-fno-inline" />
<Add directory="include/scripting/include" />
<Add directory="include/scripting/squirrel" />
</Compiler>
</Target>
Expand All @@ -62,20 +61,8 @@
<Option compiler="gcc" />
<Compiler>
<Add option="-fno-inline" />
<Add directory="include/scripting/include" />
<Add directory="include/scripting/sqstdlib" />
</Compiler>
</Target>
<Target title="SqPlus">
<Option output="sdk/scripting/lib/libsqplus" prefix_auto="0" extension_auto="1" />
<Option working_dir="" />
<Option external_deps="sdk/scripting/lib/libsquirrel.a;sdk/scripting/lib/libsqstdlib.a;" />
<Option type="2" />
<Option compiler="gcc" />
<Compiler>
<Add option="-fno-inline" />
<Add directory="include/scripting/include" />
<Add directory="include/scripting/sqplus" />
<Add directory="include/scripting/squirrel" />
</Compiler>
</Target>
<Target title="scintilla">
Expand Down Expand Up @@ -113,7 +100,7 @@
<Target title="sdk">
<Option output="devel/libcodeblocks" prefix_auto="0" extension_auto="1" />
<Option working_dir="devel" />
<Option external_deps="base/tinyxml/libtxml.a;sdk/scripting/lib/libsquirrel.a;sdk/scripting/lib/libsqstdlib.a;sdk/scripting/lib/libsqplus.a;devel/libwxscintilla_cb.a;" />
<Option external_deps="base/tinyxml/libtxml.a;sdk/scripting/lib/libsquirrel.a;sdk/scripting/lib/libsqstdlib.a;devel/libwxscintilla_cb.a;" />
<Option type="3" />
<Option compiler="gcc" />
<Option parameters="--debug-log --multiple-instance -ns -ni -v -p debug" />
Expand All @@ -123,11 +110,9 @@
<Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="`pkg-config glib-2.0 --cflags`" />
<Add option="-DSCRAT_EXPORT" />
<Add directory="include" />
<Add directory="include/tinyxml" />
<Add directory="include/scripting/bindings" />
<Add directory="include/scripting/include" />
<Add directory="include/scripting/sqplus" />
<Add directory="include/mozilla_chardet" />
<Add directory="include/mozilla_chardet/mfbt" />
<Add directory="include/mozilla_chardet/nsprpub/pr/include" />
Expand All @@ -140,9 +125,9 @@
<Add option="`pkg-config glib-2.0 --libs`" />
<Add library="txml" />
<Add library="wxscintilla_cb" />
<Add library="sqplus" />
<Add library="sqstdlib" />
<Add library="squirrel" />
<Add library="wxpropgrid" />
<Add directory="devel" />
<Add directory="sdk/scripting/lib" />
<Add directory="sdk/propgrid" />
Expand All @@ -164,8 +149,6 @@
<Add option="-DENABLE_BINRELOC" />
<Add option="-DUSE_GTK_NOTEBOOK" />
<Add directory="include" />
<Add directory="include/scripting/include" />
<Add directory="include/scripting/sqplus" />
<Add directory="include/mozilla_chardet" />
<Add directory="include/mozilla_chardet/mfbt" />
<Add directory="include/mozilla_chardet/nsprpub/pr/include" />
Expand All @@ -191,9 +174,6 @@
<Option projectLinkerOptionsRelation="1" />
<Compiler>
<Add directory="include" />
<Add directory="include/scripting/include" />
<Add directory="include/scripting/sqplus" />
<Add directory="include/scripting/bindings" />
</Compiler>
<Linker>
<Add option="`wx-config --version=2.8 --libs`" />
Expand Down Expand Up @@ -262,10 +242,9 @@
<Option run_host_application_in_terminal="0" />
<Option projectLinkerOptionsRelation="1" />
<Compiler>
<Add option="-DSCRAT_IMPORT" />
<Add directory="include" />
<Add directory="plugins/compilergcc/depslib/src" />
<Add directory="include/scripting/include" />
<Add directory="include/scripting/sqplus" />
</Compiler>
<Linker>
<Add option="`wx-config --version=2.8 --libs`" />
Expand All @@ -288,8 +267,6 @@
<Option projectLinkerOptionsRelation="1" />
<Compiler>
<Add directory="include" />
<Add directory="include/scripting/include" />
<Add directory="include/scripting/sqplus" />
</Compiler>
<Linker>
<Add option="`wx-config --version=2.8 --libs`" />
Expand Down Expand Up @@ -413,9 +390,8 @@
<Option compiler="gcc" />
<Option projectLinkerOptionsRelation="1" />
<Compiler>
<Add option="-DSCRAT_IMPORT" />
<Add directory="include" />
<Add directory="include/scripting/include" />
<Add directory="include/scripting/sqplus" />
</Compiler>
<Linker>
<Add option="`wx-config --version=2.8 --libs`" />
Expand Down Expand Up @@ -480,9 +456,9 @@
</Environment>
</Build>
<VirtualTargets>
<Add alias="All" targets="tinyXML;AutoRevision;ConsoleRunner;Squirrel;Squirrel std lib;SqPlus;scintilla;wxpropgrid;sdk;src;Abbreviations;AStyle;Autosave;Compiler depslib;Compiler;Debugger;Code-completion;Class wizard;Default MIME handler;Occurrences Highlighting;Open files list;Projects-workspaces importer;Scripted wizard;To-do;" />
<Add alias="All" targets="tinyXML;AutoRevision;ConsoleRunner;Squirrel;Squirrel std lib;scintilla;wxpropgrid;sdk;src;Abbreviations;AStyle;Autosave;Compiler depslib;Compiler;Debugger;Code-completion;Class wizard;Default MIME handler;Occurrences Highlighting;Open files list;Projects-workspaces importer;Scripted wizard;To-do;" />
<Add alias="Core app &amp; plugins" targets="sdk;src;Abbreviations;AStyle;Autosave;Compiler depslib;Compiler;Debugger;Code-completion;Class wizard;Default MIME handler;Occurrences Highlighting;Open files list;Projects-workspaces importer;Scripted wizard;To-do;" />
<Add alias="Third-party libs" targets="tinyXML;AutoRevision;ConsoleRunner;Squirrel;Squirrel std lib;SqPlus;scintilla;wxpropgrid;Compiler depslib;" />
<Add alias="Third-party libs" targets="tinyXML;AutoRevision;ConsoleRunner;Squirrel;Squirrel std lib;scintilla;wxpropgrid;Compiler depslib;" />
</VirtualTargets>
<Compiler>
<Add option="-Wall" />
Expand Down Expand Up @@ -907,59 +883,74 @@
<Unit filename="include/scripting/bindings/sc_base_types.h">
<Option target="sdk" />
</Unit>
<Unit filename="include/scripting/bindings/sc_binding_util.h">
<Option target="sdk" />
</Unit>
<Unit filename="include/scripting/bindings/sc_cb_vm.h">
<Option target="sdk" />
</Unit>
<Unit filename="include/scripting/bindings/sc_plugin.h">
<Option target="sdk" />
</Unit>
<Unit filename="include/scripting/bindings/scriptbindings.h">
<Option target="sdk" />
</Unit>
<Unit filename="include/scripting/include/sqdbgserver.h">
<Option target="Squirrel" />
<Unit filename="include/scripting/bindings/sq_wx/sq_wx.h">
<Option target="sdk" />
</Unit>
<Unit filename="include/scripting/include/sqrdbg.h">
<Option target="Squirrel" />
<Unit filename="include/scripting/bindings/sq_wx/sq_wx_type_handler.h">
<Option target="sdk" />
</Unit>
<Unit filename="include/scripting/include/sqstdaux.h">
<Option target="Squirrel std lib" />
<Unit filename="include/scripting/sqrat.h">
<Option target="sdk" />
</Unit>
<Unit filename="include/scripting/include/sqstdblob.h">
<Option target="Squirrel std lib" />
<Unit filename="include/scripting/sqrat/sqratAllocator.h">
<Option target="sdk" />
</Unit>
<Unit filename="include/scripting/include/sqstdio.h">
<Option target="Squirrel std lib" />
<Unit filename="include/scripting/sqrat/sqratArray.h">
<Option target="sdk" />
</Unit>
<Unit filename="include/scripting/include/sqstdmath.h">
<Option target="Squirrel std lib" />
<Unit filename="include/scripting/sqrat/sqratClass.h">
<Option target="sdk" />
</Unit>
<Unit filename="include/scripting/include/sqstdstring.h">
<Option target="Squirrel std lib" />
<Unit filename="include/scripting/sqrat/sqratClassType.h">
<Option target="sdk" />
</Unit>
<Unit filename="include/scripting/include/sqstdsystem.h">
<Option target="Squirrel std lib" />
<Unit filename="include/scripting/sqrat/sqratConst.h">
<Option target="sdk" />
</Unit>
<Unit filename="include/scripting/include/squirrel.h">
<Option target="Squirrel" />
<Unit filename="include/scripting/sqrat/sqratFunction.h">
<Option target="sdk" />
</Unit>
<Unit filename="include/scripting/sqplus/SqPlusConst.h">
<Option target="SqPlus" />
<Unit filename="include/scripting/sqrat/sqratGlobalMethods.h">
<Option target="sdk" />
</Unit>
<Unit filename="include/scripting/sqplus/SquirrelBindingsUtils.h">
<Option target="SqPlus" />
<Unit filename="include/scripting/sqrat/sqratMemberMethods.h">
<Option target="sdk" />
</Unit>
<Unit filename="include/scripting/sqplus/SquirrelBindingsUtilsWin32.h">
<Option target="SqPlus" />
<Unit filename="include/scripting/sqrat/sqratObject.h">
<Option target="sdk" />
</Unit>
<Unit filename="include/scripting/sqplus/SquirrelObject.h">
<Option target="SqPlus" />
<Unit filename="include/scripting/sqrat/sqratOverloadMethods.h">
<Option target="sdk" />
</Unit>
<Unit filename="include/scripting/sqplus/SquirrelVM.h">
<Option target="SqPlus" />
<Unit filename="include/scripting/sqrat/sqratScript.h">
<Option target="sdk" />
</Unit>
<Unit filename="include/scripting/sqplus/sqplus.h">
<Option target="SqPlus" />
<Unit filename="include/scripting/sqrat/sqratTable.h">
<Option target="sdk" />
</Unit>
<Unit filename="include/scripting/sqplus/sqplusWin32.h">
<Option target="SqPlus" />
<Unit filename="include/scripting/sqrat/sqratTypes.h">
<Option target="sdk" />
</Unit>
<Unit filename="include/scripting/sqrat/sqratUtil.h">
<Option target="sdk" />
</Unit>
<Unit filename="include/scripting/sqrat/sqratVM.h">
<Option target="sdk" />
</Unit>
<Unit filename="include/scripting/sqrat/sqratext_Ref.h">
<Option target="sdk" />
</Unit>
<Unit filename="include/scripting/sqstdlib/sqstdblobimpl.h">
<Option target="Squirrel std lib" />
Expand All @@ -979,6 +970,10 @@
<Unit filename="include/scripting/squirrel/sqcompiler.h">
<Option target="Squirrel" />
</Unit>
<Unit filename="include/scripting/squirrel/sqdbgserver.h">
<Option target="Squirrel" />
<Option target="Squirrel std lib" />
</Unit>
<Unit filename="include/scripting/squirrel/sqfuncproto.h">
<Option target="Squirrel" />
</Unit>
Expand All @@ -1000,15 +995,47 @@
<Unit filename="include/scripting/squirrel/sqpcheader.h">
<Option target="Squirrel" />
</Unit>
<Unit filename="include/scripting/squirrel/sqrdbg.h">
<Option target="Squirrel" />
<Option target="Squirrel std lib" />
</Unit>
<Unit filename="include/scripting/squirrel/sqstate.h">
<Option target="Squirrel" />
</Unit>
<Unit filename="include/scripting/squirrel/sqstdaux.h">
<Option target="Squirrel" />
<Option target="Squirrel std lib" />
</Unit>
<Unit filename="include/scripting/squirrel/sqstdblob.h">
<Option target="Squirrel" />
<Option target="Squirrel std lib" />
</Unit>
<Unit filename="include/scripting/squirrel/sqstdio.h">
<Option target="Squirrel" />
<Option target="Squirrel std lib" />
</Unit>
<Unit filename="include/scripting/squirrel/sqstdmath.h">
<Option target="Squirrel" />
<Option target="Squirrel std lib" />
</Unit>
<Unit filename="include/scripting/squirrel/sqstdstring.h">
<Option target="Squirrel" />
<Option target="Squirrel std lib" />
</Unit>
<Unit filename="include/scripting/squirrel/sqstdsystem.h">
<Option target="Squirrel" />
<Option target="Squirrel std lib" />
</Unit>
<Unit filename="include/scripting/squirrel/sqstring.h">
<Option target="Squirrel" />
</Unit>
<Unit filename="include/scripting/squirrel/sqtable.h">
<Option target="Squirrel" />
</Unit>
<Unit filename="include/scripting/squirrel/squirrel.h">
<Option target="Squirrel" />
<Option target="Squirrel std lib" />
</Unit>
<Unit filename="include/scripting/squirrel/squserdata.h">
<Option target="Squirrel" />
</Unit>
Expand Down Expand Up @@ -2251,19 +2278,22 @@
<Option target="sdk" />
</Unit>
<Unit filename="scripts/tests/menu_test_plugin.script">
<Option target="src" />
<Option target="sdk" />
</Unit>
<Unit filename="scripts/tests/script_test_plugin.script">
<Option target="src" />
<Option target="sdk" />
</Unit>
<Unit filename="scripts/tests/test_base.script">
<Option target="src" />
<Option target="sdk" />
</Unit>
<Unit filename="scripts/tests/user_dialog_test_plugin.script">
<Option target="src" />
<Unit filename="scripts/tests/test_cb_interna.script">
<Option target="sdk" />
</Unit>
<Unit filename="scripts/tests/wx_test.script">
<Option target="src" />
<Unit filename="scripts/tests/test_wx.script">
<Option target="sdk" />
</Unit>
<Unit filename="scripts/tests/user_dialog_test_plugin.script">
<Option target="sdk" />
</Unit>
<Unit filename="scripts/wx_help.script">
<Option target="src" />
Expand Down Expand Up @@ -2929,6 +2959,9 @@
<Unit filename="sdk/resources/select_target.xrc">
<Option target="sdk" />
</Unit>
<Unit filename="sdk/scripting/bindings/sc_cb_vm.cpp">
<Option target="sdk" />
</Unit>
<Unit filename="sdk/scripting/bindings/sc_consts.cpp">
<Option target="sdk" />
</Unit>
Expand All @@ -2950,28 +2983,23 @@
<Unit filename="sdk/scripting/bindings/sc_util_dialogs.cpp">
<Option target="sdk" />
</Unit>
<Unit filename="sdk/scripting/bindings/sc_wxtypes.cpp">
<Option target="sdk" />
</Unit>
<Unit filename="sdk/scripting/bindings/scriptbindings.cpp">
<Option target="sdk" />
</Unit>
<Unit filename="sdk/scripting/sqplus/SqPlus.cpp">
<Option target="SqPlus" />
<Unit filename="sdk/scripting/bindings/sq_wx/sq_util_dialogs.cpp">
<Option target="sdk" />
</Unit>
<Unit filename="sdk/scripting/sqplus/SquirrelBindingsUtils.cpp">
<Option target="SqPlus" />
<Unit filename="sdk/scripting/bindings/sq_wx/sq_wx.cpp">
<Option target="sdk" />
</Unit>
<Unit filename="sdk/scripting/sqplus/SquirrelBindingsUtilsWin32.cpp">
<Option compile="0" />
<Option link="0" />
<Option target="SqPlus" />
<Unit filename="sdk/scripting/bindings/sq_wx/sq_wx_constants.cpp">
<Option target="sdk" />
</Unit>
<Unit filename="sdk/scripting/sqplus/SquirrelObject.cpp">
<Option target="SqPlus" />
<Unit filename="sdk/scripting/bindings/sq_wx/sq_wx_string.cpp">
<Option target="sdk" />
</Unit>
<Unit filename="sdk/scripting/sqplus/SquirrelVM.cpp">
<Option target="SqPlus" />
<Unit filename="sdk/scripting/bindings/sq_wx/sq_wxtypes.cpp">
<Option target="sdk" />
</Unit>
<Unit filename="sdk/scripting/sqstdlib/sqstdaux.cpp">
<Option target="Squirrel std lib" />
Expand Down Expand Up @@ -3009,6 +3037,9 @@
<Unit filename="sdk/scripting/squirrel/sqcompiler.cpp">
<Option target="Squirrel" />
</Unit>
<Unit filename="sdk/scripting/squirrel/sqdbgserver.cpp">
<Option target="Squirrel" />
</Unit>
<Unit filename="sdk/scripting/squirrel/sqdebug.cpp">
<Option target="Squirrel" />
</Unit>
Expand All @@ -3024,6 +3055,9 @@
<Unit filename="sdk/scripting/squirrel/sqobject.cpp">
<Option target="Squirrel" />
</Unit>
<Unit filename="sdk/scripting/squirrel/sqrdbg.cpp">
<Option target="Squirrel" />
</Unit>
<Unit filename="sdk/scripting/squirrel/sqstate.cpp">
<Option target="Squirrel" />
</Unit>
Expand Down
Loading