فهرست منبع

Build AtomicEditor as a console application so we have easy access to log, added Atomic.openConsoleWindow function, don't use timestamps on log by default

JoshEngebretson 10 سال پیش
والد
کامیت
128dcdee87
3فایلهای تغییر یافته به همراه18 افزوده شده و 3 حذف شده
  1. 1 1
      Source/Atomic/IO/Log.cpp
  2. 5 1
      Source/AtomicEditor/CMakeLists.txt
  3. 12 1
      Source/AtomicJS/Javascript/JSAtomic.cpp

+ 1 - 1
Source/Atomic/IO/Log.cpp

@@ -64,7 +64,7 @@ Log::Log(Context* context) :
 #else
     level_(LOG_INFO),
 #endif
-    timeStamp_(true),
+    timeStamp_(false),
     inWrite_(false),
     quiet_(false)
 {

+ 5 - 1
Source/AtomicEditor/CMakeLists.txt

@@ -18,7 +18,11 @@ elseif(LINUX)
 else()
     include_directories (${CMAKE_SOURCE_DIR}/Source/ThirdParty/libcurl/include)
     add_definitions(-DCURL_STATICLIB)
-    set (EXE_TYPE WIN32)
+    
+    # We want the console for now
+    #set (EXE_TYPE WIN32)
+    add_definitions(-DATOMIC_WIN32_CONSOLE)
+    
     set (SOURCE_FILES ${SOURCE_FILES} ${CMAKE_SOURCE_DIR}/CMake/Modules/Atomic.rc)
 endif(APPLE)
 

+ 12 - 1
Source/AtomicJS/Javascript/JSAtomic.cpp

@@ -74,6 +74,15 @@ static int js_print(duk_context* ctx)
     return 0;
 }
 
+static int js_openConsoleWindow(duk_context* ctx)
+{
+#ifdef _WIN32
+    OpenConsoleWindow();
+#endif
+
+    return 0;
+}
+
 static int js_assert(duk_context* ctx)
 {
     if (!duk_to_boolean(ctx, 0))
@@ -259,7 +268,6 @@ void jsapi_init_atomic(JSVM* vm)
     // Atomic
     duk_get_global_string(ctx, "Atomic");
 
-
     String platform = GetPlatform();
     if (platform == "Mac OS X")
         platform = "MacOSX";
@@ -273,6 +281,9 @@ void jsapi_init_atomic(JSVM* vm)
     duk_put_prop_index(ctx, -2, JS_GLOBALSTASH_INDEX_NODE_REGISTRY);
     duk_pop(ctx);
 
+    duk_push_c_function(ctx, js_openConsoleWindow, 0);
+    duk_put_prop_string(ctx, -2, "openConsoleWindow");
+
     duk_push_c_function(ctx, js_atomic_GetVM, 0);
     duk_put_prop_string(ctx, -2, "getVM");