Showing the changes to src/core/chuck.cpp (1 of 26 files). Show all
Unified · Split
| @@ -36,10 +36,20 @@ · 35 unmodified lines | ||
| 36 | 36 | //----------------------------------------------------------------------------- |
| 37 | 37 | #include "chuck.h" |
| 38 | 38 | #include "chuck_errmsg.h" |
| 39 | −//#include "chuck_io.h" | |
| 40 | −//#include "chuck_otf.h" | |
| 41 | −//#include "ulib_machine.h" | |
| 42 | −//#include "util_network.h" | |
| 39 | + | |
| 40 | +#ifndef __DISABLE_SERIAL__ | |
| 41 | +#include "chuck_io.h" | |
| 42 | +#endif | |
| 43 | + | |
| 44 | +#ifndef __DISABLE_OTF_SERVER__ | |
| 45 | +#include "chuck_otf.h" | |
| 46 | +#include "ulib_machine.h" | |
| 47 | +#endif | |
| 48 | + | |
| 49 | +#ifndef __DISABLE_NETWORK__ | |
| 50 | +#include "util_network.h" | |
| 51 | +#endif | |
| 52 | + | |
| 43 | 53 | #include "util_string.h" |
| 44 | 54 | #include "ugen_stk.h" |
| 45 | 55 | |
| @@ -100,14 +110,16 @@ const char * ChucK::version() · 54 unmodified lines | ||
| 100 | 110 | |
| 101 | 111 | |
| 102 | 112 | |
| 103 | −////----------------------------------------------------------------------------- | |
| 104 | −//// name: intSize() | |
| 105 | −//// desc: get chuck int size (in bits) | |
| 106 | −////----------------------------------------------------------------------------- | |
| 107 | −//t_CKUINT ChucK::intSize() | |
| 108 | −//{ | |
| 109 | −// return machine_intsize(); | |
| 110 | −//} | |
| 113 | +#ifndef __DISABLE_OTF_SERVER__ | |
| 114 | +//----------------------------------------------------------------------------- | |
| 115 | +// name: intSize() | |
| 116 | +// desc: get chuck int size (in bits) | |
| 117 | +//----------------------------------------------------------------------------- | |
| 118 | +t_CKUINT ChucK::intSize() | |
| 119 | +{ | |
| 120 | + return machine_intsize(); | |
| 121 | +} | |
| 122 | +#endif | |
| 111 | 123 | |
| 112 | 124 | |
| 113 | 125 | |
| @@ -1322,8 +1334,10 @@ void ChucK::globalCleanup() · 1208 unmodified lines | ||
| 1322 | 1334 | HidInManager::cleanup(); |
| 1323 | 1335 | #endif // __ALTER_HID__ |
| 1324 | 1336 | |
| 1337 | + #ifndef __DISABLE_SERIAL__ | |
| 1325 | 1338 | // shutdown serial |
| 1326 | −// Chuck_IO_Serial::shutdown(); | |
| 1339 | + Chuck_IO_Serial::shutdown(); | |
| 1340 | + #endif | |
| 1327 | 1341 | |
| 1328 | 1342 | #ifndef __DISABLE_KBHIT__ |
| 1329 | 1343 | // shutdown kb loop |
| @@ -1368,5 +1382,7 @@ t_CKINT ChucK::getLogLevel() · 38 unmodified lines | ||
| 1368 | 1382 | //----------------------------------------------------------------------------- |
| 1369 | 1383 | void ChucK::poop() |
| 1370 | 1384 | { |
| 1371 | −// ::uh(); | |
| 1385 | + #ifndef __DISABLE_OTF_SERVER__ | |
| 1386 | + ::uh(); | |
| 1387 | + #endif | |
| 1372 | 1388 | } |