Merge branch 'main' of https://git.indoodle.com/jason/bellatui

README.md

@@ -175,14 +175,21 @@ cd bellatui
 make all -j4
 ```
 
-# Windows
+## Windows (win10) 
-https://aka.ms/vs/17/release/vs_BuildTools.exe
+- [optioanl] Install https://git-scm.com
-[ ] Desktop development with C++
 
-Get bella_engine_sdk
+- Download Visual Studio Community Edition 2022
+- Run VisualStudioSetup.exe
+- Workload = [x] Desktop development with C++
+- Individual components = [x] Git For Windows
 
 #### x64 Developer console
 ```
+cd %USERPROFILE% 
+mkdir workdir  
+cd workdir
+curl -LO https://downloads.bellarender.com/bella_engine_sdk-25.3.0-win32.zip
+tar -xf bella_engine_sdk-25.3.0-win32.zip
 git clone https://github.com/microsoft/vcpkg.git
 cd vcpkg
 bootstrap-vcpkg.bat
@@ -191,13 +198,13 @@ vcpkg.exe install cppzmq:x64-windows
 vcpkg integrate install
 cd ..
 git clone https://github.com/SpartanJ/efsw.git
-mkdir -p efsw/build
+mkdir -p efsw\build
 cd efsw/build
 cmake ..
 msbuild efsw.sln /p:Configuration=Release /p:Platform=x64
 cd ../..
-git clone https://github.com/oomer/bellatui.git
+git clone https://git.indoodle.com/jason/bellatui.git
-
+cd bellatui
 msbuild bellatui.vcxproj /p:Configuration=release /p:Platform=x64 /p:PlatformToolset=v143
 ```
 

bellatui.cpp

@@ -611,6 +611,7 @@ int DL_main(Args& args)
     args.add("li",  "licenseinfo",   "",   "prints license info");
     args.add("ef",  "efsw",   "",   "mode efsw");
     args.add("wd",  "watchdir",   "",   "mode file warch");
+	args.add("j", "jason", "", "print hello jason");
 
     // Handle special command-line options
     if (args.versionReqested())
@@ -624,6 +625,13 @@ int DL_main(Args& args)
         printf("%s", args.help("SDK Test", fs::exePath(), bellaSdkVersion().toString()).buf());
         return 0;
     }
+
+    // print hello jason
+    if (args.have("--jason")) {
+        std::cout << "Hello Jason!" << std::endl;
+        return 0;
+	}
+
     std::string path=".";
 
     if (args.have("--watchdir")) {

bellatui.vcxproj

@@ -14,6 +14,7 @@
     <VCProjectVersion>16.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{7AEA0690-36B7-4596-9DEE-C3AB3C11D282}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PseudoDebug|x64'" Label="Configuration">
@@ -95,16 +96,24 @@
       copy "$(ProjectDir)..\bella_engine_sdk\lib\dl_core.dll" "$(TargetDir)" &amp;
       echo dl_core.dll copied &amp;
       copy "$(ProjectDir)..\bella_engine_sdk\lib\dl_oidn_core.dll" "$(TargetDir)" &amp;
-      echo dl_oidn_core.dll copied &amp;
+      echo dl_oidn_core.dll copied &amp;      
       copy "$(ProjectDir)..\vcpkg\installed\x64-windows\bin\libzmq-mt-4_3_5.dll" "$(TargetDir)" &amp;
       echo libzmq-mt-4_3_5.dll copied &amp;
       copy "$(ProjectDir)..\vcpkg\installed\x64-windows\bin\libsodium.dll" "$(TargetDir)" &amp;
       echo libsodium.dll copied &amp;
+      copy "$(ProjectDir)..\bella_engine_sdk\lib\dl_usd_ms.dll" "$(TargetDir)" &amp;
+      echo dl_usd_ms.dll copied &amp;
       echo Post-build event finished</Command>
     </PostBuildEvent>
+    <ClCompile>
+      <LanguageStandard Condition="'$(Configuration)|$(Platform)'=='PseudoDebug|x64'">stdcpp17</LanguageStandard>
+    </ClCompile>
+    <ClCompile>
+      <LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Release|x64'">stdcpp17</LanguageStandard>
+    </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-      <ClInclude Include="..\bella_engine_sdk\src\bella_sdk\api.h" />
+    <ClInclude Include="..\bella_engine_sdk\src\bella_sdk\api.h" />
     <ClInclude Include="..\bella_engine_sdk\src\bella_sdk\bella_engine.h" />
     <ClInclude Include="..\bella_engine_sdk\src\bella_sdk\bella_nodeapi.h" />
     <ClInclude Include="..\bella_engine_sdk\src\bella_sdk\bella_scene.h" />
@@ -157,5 +166,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
-

makefile

@@ -27,9 +27,22 @@ ifeq ($(PLATFORM), Darwin)
     # Compiler settings
     CC                   = clang
     CXX                  = clang++
+    
+	# Architecture flags
+	# Get the current architecture
+	ARCH := $(shell arch)
+
+	# Set architecture-specific flags if needed
+	ifeq ($(ARCH),i386) # i386 is the architecture for Intel on some older systems
+		ARCH_FLAG := -arch x86_64
+	else ifeq ($(ARCH),x86_64)
+		ARCH_FLAG := -arch x86_64
+	else ifeq ($(ARCH),arm64)
+		ARCH_FLAG := -arch arm64
+	endif
 
     # Architecture flags
-    ARCH_FLAGS           = -arch arm64 -mmacosx-version-min=11.0 -isysroot $(MACOS_SDK_PATH)
+    ARCH_FLAGS           = $(ARCH_FLAG) -mmacosx-version-min=11.0 -isysroot $(MACOS_SDK_PATH)
 
     # Linking flags - Use multiple rpath entries to look in executable directory
     LINKER_FLAGS         = $(ARCH_FLAGS) -framework Cocoa -framework IOKit -fvisibility=hidden -O5 \
@@ -51,7 +64,6 @@ else
     CC                   = gcc
     CXX                  = g++
 
-    # Architecture flags
     ARCH_FLAGS           = -m64 -D_FILE_OFFSET_BITS=64
 
     # Linking flags
@@ -100,6 +112,7 @@ $(OUTPUT_FILE): $(OBJECT_FILES)
 	$(CXX) -o $@ $(OBJECT_FILES) $(LINKER_FLAGS) $(LIB_PATHS) $(LIBRARIES)
 	@echo "Copying libraries to $(BIN_DIR)..."
 	@cp $(SDK_LIB_PATH)/$(SDK_LIB_FILE) $(BIN_DIR)/$(SDK_LIB_FILE)
+	@cp $(SDK_LIB_PATH)/libdl_usd_ms.$(SDK_LIB_EXT) $(BIN_DIR)/libdl_usd_ms.$(SDK_LIB_EXT)
 #	@cp $(LZFSE_BUILD_DIR)/$(LZFSE_LIB_NAME) $(BIN_DIR)/$(LZFSE_LIB_NAME)
 #	@cp $(PLIST_LIB_DIR)/$(PLIST_LIB_NAME) $(BIN_DIR)/$(PLIST_LIB_NAME)
 	@cp $(EFSW_LIB_PATH)/$(EFSW_LIB_NAME) $(BIN_DIR)/$(EFSW_LIB_NAME)
@@ -134,4 +147,4 @@ cleanall:
 	rmdir obj/* 2>/dev/null || true
 	rmdir bin/* 2>/dev/null || true
 	rmdir obj 2>/dev/null || true
-	rmdir bin 2>/dev/null || true
+	rmdir bin 2>/dev/null || true