History

undo test commenting out code with preprocessor directives

Jack Atherton committed 7 years ago

Commit b91dd1e1 parent db1a1dd26 files · +7454 −7195Browse files

Showing the changes to src/core/chuck_compile.cpp (1 of 26 files). Show all

Unified · Split

src/core/chuck_compile.cpp+36−10
@@ -32,7 +32,9 @@ · 31 unmodified lines
3232 #include "chuck_compile.h"
3333 #include "chuck_lang.h"
3434 #include "chuck_errmsg.h"
35−//#include "chuck_otf.h"
35+#ifndef __DISABLE_OTF_SERVER__
36+#include "chuck_otf.h"
37+#endif
3638
3739 #include "ugen_osc.h"
3840 #include "ugen_xxx.h"
@@ -40,12 +42,23 @@ · 1 unmodified line
4042 #include "ugen_stk.h"
4143 #include "uana_xform.h"
4244 #include "uana_extract.h"
43−//#include "ulib_machine.h"
45+
46+#ifndef __DISABLE_OTF_SERVER__
47+#include "ulib_machine.h"
48+#endif
49+
4450 #include "ulib_math.h"
4551 #include "ulib_std.h"
46−//#include "ulib_opsc.h"
52+
53+#ifndef __DISABLE_NETWORK__
54+#include "ulib_opsc.h"
55+#endif
56+
4757 #include "ulib_regex.h"
48−//#include "chuck_io.h"
58+
59+#ifndef __DISABLE_SERIAL__
60+#include "chuck_io.h"
61+#endif
4962
5063 #if defined(__PLATFORM_WIN32__)
5164 #include "dirent_win32.h"
@@ -649,22 +662,35 @@ t_CKBOOL load_internal_modules( Chuck_Compiler * compiler ) · 597 unmodified lines
649662 load_module( compiler, env, extract_query, "extract", "global" );
650663
651664 // load
665+ #ifndef __DISABLE_OTF_SERVER__
652666 EM_log( CK_LOG_SEVERE, "class 'machine'..." );
653−// if( !load_module( compiler, env, machine_query, "Machine", "global" ) ) goto error;
654−// machine_init( compiler, otf_process_msg );
667+ if( !load_module( compiler, env, machine_query, "Machine", "global" ) ) goto error;
668+ machine_init( compiler, otf_process_msg );
669+ #endif
670+
655671 EM_log( CK_LOG_SEVERE, "class 'std'..." );
656672 if( !load_module( compiler, env, libstd_query, "Std", "global" ) ) goto error;
657673 EM_log( CK_LOG_SEVERE, "class 'math'..." );
658674 if( !load_module( compiler, env, libmath_query, "Math", "global" ) ) goto error;
659675
660−// EM_log( CK_LOG_SEVERE, "class 'opsc'..." );
661−// if( !load_module( compiler, env, opensoundcontrol_query, "opsc", "global" ) ) goto error;
676+ #ifndef __DISABLE_NETWORK__
677+ EM_log( CK_LOG_SEVERE, "class 'opsc'..." );
678+ if( !load_module( compiler, env, opensoundcontrol_query, "opsc", "global" ) ) goto error;
679+ #endif
680+
662681 EM_log( CK_LOG_SEVERE, "class 'RegEx'..." );
663682 if( !load_module( compiler, env, regex_query, "RegEx", "global" ) ) goto error;
683+
684+ // Deprecated:
664685 // if( !load_module( compiler, env, net_query, "net", "global" ) ) goto error;
665686
666−// if( !init_class_HID( env ) ) goto error;
667−// if( !init_class_serialio( env ) ) goto error;
687+ #ifndef __DISABLE_HID__
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
668694
669695 // clear context
670696 type_engine_unload_context( env );

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t