Browse Source

Fix string issue when generating C# bindings

JoshEngebretson 10 years ago
parent
commit
1e9010b544

+ 4 - 6
Source/AtomicTool/CMakeLists.txt

@@ -2,7 +2,7 @@ set (ATOMIC_TOOL_SOURCES AtomicTool.cpp AtomicTool.h)
 
 
 if (MSVC)
 if (MSVC)
     add_definitions(-DATOMIC_WIN32_CONSOLE)
     add_definitions(-DATOMIC_WIN32_CONSOLE)
-endif()
+endif(MSVC)
 
 
 add_executable(AtomicTool ${ATOMIC_TOOL_SOURCES})
 add_executable(AtomicTool ${ATOMIC_TOOL_SOURCES})
 
 
@@ -63,10 +63,8 @@ add_custom_command(TARGET AtomicTool POST_BUILD
                    COMMAND $<TARGET_FILE:AtomicTool> net-projectgen "\"${CMAKE_SOURCE_DIR}/Script/AtomicNET/AtomicNETProjects.json\"" MACOSX
                    COMMAND $<TARGET_FILE:AtomicTool> net-projectgen "\"${CMAKE_SOURCE_DIR}/Script/AtomicNET/AtomicNETProjects.json\"" MACOSX
                    COMMAND /usr/local/bin/xbuild
                    COMMAND /usr/local/bin/xbuild
                    COMMENT "Compiling AtomicNET Assemblies")
                    COMMENT "Compiling AtomicNET Assemblies")
-endif(IOS)
-
-endif(APPLE)
-
-endif(MSVC)
+endif(xbuild)
+endif(NOT IOS)
+endif()
 
 
 endif(ATOMIC_DOTNET_DEV)
 endif(ATOMIC_DOTNET_DEV)

+ 1 - 1
Source/ToolCore/JSBind/CSharp/CSClassWriter.cpp

@@ -227,7 +227,7 @@ void CSClassWriter::GenerateManagedSource(String& sourceOut)
     // Make sure we have at least a IntPtr version
     // Make sure we have at least a IntPtr version
     if (!wroteConstructor)
     if (!wroteConstructor)
     {
     {
-        LOGINFOF("WARNING: %s class didn't write a constructor, filling in generated native constructor");
+        LOGINFOF("WARNING: %s class didn't write a constructor, filling in generated native constructor", klass_->GetName().CString());
 
 
         line = ToString("public %s (IntPtr native) : base (native)\n", klass_->GetName().CString());
         line = ToString("public %s (IntPtr native) : base (native)\n", klass_->GetName().CString());
         source += IndentLine(line);
         source += IndentLine(line);