Showing the changes to src/core/chuck_compile.cpp (1 of 26 files). Show all
Unified · Split
| @@ -32,7 +32,9 @@ · 31 unmodified lines | |||
| 32 | #include "chuck_compile.h" | 32 | #include "chuck_compile.h" |
| 33 | #include "chuck_lang.h" | 33 | #include "chuck_lang.h" |
| 34 | #include "chuck_errmsg.h" | 34 | #include "chuck_errmsg.h" |
| 35 | //#include "chuck_otf.h" | 35 | #ifndef __DISABLE_OTF_SERVER__ |
| 36 | #include "chuck_otf.h" | ||
| 37 | #endif | ||
| 36 | 38 | ||
| 37 | #include "ugen_osc.h" | 39 | #include "ugen_osc.h" |
| 38 | #include "ugen_xxx.h" | 40 | #include "ugen_xxx.h" |
| @@ -40,12 +42,23 @@ · 1 unmodified line | |||
| 40 | #include "ugen_stk.h" | 42 | #include "ugen_stk.h" |
| 41 | #include "uana_xform.h" | 43 | #include "uana_xform.h" |
| 42 | #include "uana_extract.h" | 44 | #include "uana_extract.h" |
| 43 | //#include "ulib_machine.h" | 45 | |
| 46 | #ifndef __DISABLE_OTF_SERVER__ | ||
| 47 | #include "ulib_machine.h" | ||
| 48 | #endif | ||
| 49 | |||
| 44 | #include "ulib_math.h" | 50 | #include "ulib_math.h" |
| 45 | #include "ulib_std.h" | 51 | #include "ulib_std.h" |
| 46 | //#include "ulib_opsc.h" | 52 | |
| 53 | #ifndef __DISABLE_NETWORK__ | ||
| 54 | #include "ulib_opsc.h" | ||
| 55 | #endif | ||
| 56 | |||
| 47 | #include "ulib_regex.h" | 57 | #include "ulib_regex.h" |
| 48 | //#include "chuck_io.h" | 58 | |
| 59 | #ifndef __DISABLE_SERIAL__ | ||
| 60 | #include "chuck_io.h" | ||
| 61 | #endif | ||
| 49 | 62 | ||
| 50 | #if defined(__PLATFORM_WIN32__) | 63 | #if defined(__PLATFORM_WIN32__) |
| 51 | #include "dirent_win32.h" | 64 | #include "dirent_win32.h" |
| @@ -649,22 +662,35 @@ t_CKBOOL load_internal_modules( Chuck_Compiler * compiler ) · 597 unmodified lines | |||
| 649 | load_module( compiler, env, extract_query, "extract", "global" ); | 662 | load_module( compiler, env, extract_query, "extract", "global" ); |
| 650 | 663 | ||
| 651 | // load | 664 | // load |
| 665 | #ifndef __DISABLE_OTF_SERVER__ | ||
| 652 | EM_log( CK_LOG_SEVERE, "class 'machine'..." ); | 666 | EM_log( CK_LOG_SEVERE, "class 'machine'..." ); |
| 653 | // if( !load_module( compiler, env, machine_query, "Machine", "global" ) ) goto error; | 667 | if( !load_module( compiler, env, machine_query, "Machine", "global" ) ) goto error; |
| 654 | // machine_init( compiler, otf_process_msg ); | 668 | machine_init( compiler, otf_process_msg ); |
| 669 | #endif | ||
| 670 | |||
| 655 | EM_log( CK_LOG_SEVERE, "class 'std'..." ); | 671 | EM_log( CK_LOG_SEVERE, "class 'std'..." ); |
| 656 | if( !load_module( compiler, env, libstd_query, "Std", "global" ) ) goto error; | 672 | if( !load_module( compiler, env, libstd_query, "Std", "global" ) ) goto error; |
| 657 | EM_log( CK_LOG_SEVERE, "class 'math'..." ); | 673 | EM_log( CK_LOG_SEVERE, "class 'math'..." ); |
| 658 | if( !load_module( compiler, env, libmath_query, "Math", "global" ) ) goto error; | 674 | if( !load_module( compiler, env, libmath_query, "Math", "global" ) ) goto error; |
| 659 | 675 | ||
| 660 | // EM_log( CK_LOG_SEVERE, "class 'opsc'..." ); | 676 | #ifndef __DISABLE_NETWORK__ |
| 661 | // if( !load_module( compiler, env, opensoundcontrol_query, "opsc", "global" ) ) goto error; | 677 | EM_log( CK_LOG_SEVERE, "class 'opsc'..." ); |
| 678 | if( !load_module( compiler, env, opensoundcontrol_query, "opsc", "global" ) ) goto error; | ||
| 679 | #endif | ||
| 680 | |||
| 662 | EM_log( CK_LOG_SEVERE, "class 'RegEx'..." ); | 681 | EM_log( CK_LOG_SEVERE, "class 'RegEx'..." ); |
| 663 | if( !load_module( compiler, env, regex_query, "RegEx", "global" ) ) goto error; | 682 | if( !load_module( compiler, env, regex_query, "RegEx", "global" ) ) goto error; |
| 683 | |||
| 684 | // Deprecated: | ||
| 664 | // if( !load_module( compiler, env, net_query, "net", "global" ) ) goto error; | 685 | // if( !load_module( compiler, env, net_query, "net", "global" ) ) goto error; |
| 665 | 686 | ||
| 666 | // if( !init_class_HID( env ) ) goto error; | 687 | #ifndef __DISABLE_HID__ |
| 667 | // if( !init_class_serialio( env ) ) goto error; | 688 | if( !init_class_HID( env ) ) goto error; |
| 689 | #endif | ||
| 690 | |||
| 691 | #ifndef __DISABLE_SERIAL__ | ||
| 692 | if( !init_class_serialio( env ) ) goto error; | ||
| 693 | #endif | ||
| 668 | 694 | ||
| 669 | // clear context | 695 | // clear context |
| 670 | type_engine_unload_context( env ); | 696 | type_engine_unload_context( env ); |