[BUG] Windows OK

Author: jferdelyi

.gitignore

@@ -52,8 +52,7 @@ data_*/
 .DS_Store
 
 # Specific
-lib/libcrypto64MD.lib
-lib/libssl64MD.lib
-demo/addons/GDPaho/windows/libgdpaho.dll
-demo/addons/GDPaho/windows/libgdpaho.lib
 /build
+/demo/.godot/
+/demo/addons/GDPaho/bin/
+*.import

CMakeLists.txt

@@ -1,19 +1,42 @@
 cmake_minimum_required(VERSION 3.6)
 project(gdpaho)
 
+option(BUILD_FOR_EDITOR "If true, create and install libs as release ready to use in the demo folder" FALSE)
+
 set(GODOT_GDEXTENSION_DIR godot-cpp/gdextension/ CACHE STRING "Path to GDExtension interface header directory")
 set(CPP_BINDINGS_PATH godot-cpp CACHE STRING "Path to C++ bindings")
 
+if(DEFINED BUILD_FOR_EDITOR)
+	if(${BUILD_FOR_EDITOR})
+		set(CMAKE_BUILD_TYPE Release)
+		message("Build for editor mode ignore CMAKE_BUILD_TYPE, " CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}")
+		execute_process(
+			COMMAND cmake -DCMAKE_BUILD_TYPE=Release godot-cpp -B godot-cpp
+			WORKING_DIRECTORY "."
+			COMMAND_ECHO STDOUT
+		)
+		execute_process(
+			COMMAND cmake --build godot-cpp
+			WORKING_DIRECTORY "."
+			COMMAND_ECHO STDOUT
+		)
+	endif()
+endif()
+
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 	set(TARGET_PATH x11)
+	set(LIB_EXT ".so")
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 	set(TARGET_PATH win64)
-	set(PAHO_MQTT_C_LIBRARIES "C:/Program Files (x86)/Eclipse Paho C/lib/" CACHE PATH "Paho C libraries directory override" FORCE)
+	set(PAHO_MQTT_C_LIBRARIES "C:/Program Files (x86)/Eclipse Paho C/lib/paho-mqtt3as-static.lib" CACHE PATH "Paho C libraries directory override" FORCE)
 	set(PAHO_MQTT_C_INCLUDE_DIRS "C:/Program Files (x86)/Eclipse Paho C/include/" CACHE PATH "Paho C includes directory override" FORCE)
 	set(PahoMqttCpp_DIR "C:/Program Files (x86)/paho-mqtt-cpp/lib/cmake/PahoMqttCpp" CACHE PATH "Paho CPP directory override" FORCE)
+	set(LIB_EXT ".dll")
 
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
 	set(TARGET_PATH macos)
+	set(LIB_EXT ".dylib")
+
 else()
 	message(FATAL_ERROR "Not implemented support for ${CMAKE_SYSTEM_NAME}")
 endif()
@@ -157,7 +180,7 @@ find_package(PahoMqttCpp REQUIRED)
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 	target_link_directories(${PROJECT_NAME}
 		PRIVATE
-		${CPP_BINDINGS_PATH}/bin/${BUILD_TYPE}
+		${CPP_BINDINGS_PATH}/bin/Debug # "Debug" Always seems to be a bug on Windows
 	)
 	target_link_libraries(${PROJECT_NAME}
 		godot-cpp.${SYSTEM_NAME}.${BUILD_TYPE}$<$<NOT:$<PLATFORM_ID:Android>>:.${BITS}>
@@ -175,12 +198,18 @@ else()
 		PahoMqttCpp::paho-mqttpp3-static
 	)
 endif()
-
-# Add the compile flags
-set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS ${GODOT_COMPILE_FLAGS})
-set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS ${GODOT_LINKER_FLAGS})
+	
+	# Add the compile flags
+	set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS ${GODOT_COMPILE_FLAGS})
+	set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS ${GODOT_LINKER_FLAGS})
 if(CMAKE_BUILD_TYPE MATCHES Debug)
 	set_property(TARGET ${PROJECT_NAME} PROPERTY OUTPUT_NAME "gdpaho.debug")
 else()
 	set_property(TARGET ${PROJECT_NAME} PROPERTY OUTPUT_NAME "gdpaho.release")
 endif()
+
+if(${BUILD_FOR_EDITOR})
+	add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
+		COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_PATH}/${PROJECT_NAME}.release${LIB_EXT} ${BUILD_PATH}/gdpaho.debug${LIB_EXT}
+	)
+endif()

README.md

@@ -33,22 +33,10 @@ Dependencies:
 
 The editor uses the debug version, but if you want to export your project as a release, you have to compile everything as a release as well:
  - Run `git clone --recurse-submodules https://github.com/GDWired/GDPaho.git -b godot-4`
-  
-One command compile debug
-```cmake
-cmake -DCMAKE_BUILD_TYPE=Debug godot-cpp -B godot-cpp
-cmake --build godot-cpp
-mkdir build
-cmake -DCMAKE_BUILD_TYPE=Debug . -B build
-cmake --build build
-```
 
-One command compile release
+Compile everything in release and copy libs to the demo folder ready to use by Godot4.
 ```cmake
-cmake -DCMAKE_BUILD_TYPE=Release godot-cpp -B godot-cpp
-cmake --build godot-cpp
-mkdir build
-cmake -DCMAKE_BUILD_TYPE=Release . -B build
+cmake -DBUILD_FOR_EDITOR=True . -B build
 cmake --build build
 ```
 
@@ -60,24 +48,20 @@ Should be done in root
 ```console
 git clone https://github.com/eclipse/paho.mqtt.c.git
 cd paho.mqtt.c
-mkdir build
-cd build
-[macOS] cmake .. -DPAHO_BUILD_SHARED=FALSE -DPAHO_BUILD_STATIC=TRUE -DPAHO_HIGH_PERFORMANCE=TRUE -DPAHO_WITH_SSL=TRUE -DPAHO_ENABLE_TESTING=FALSE -DOPENSSL_ROOT_DIR=$(brew --prefix openssl) -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-[Windows] cmake .. -DPAHO_BUILD_SHARED=FALSE -DPAHO_BUILD_STATIC=TRUE -DPAHO_HIGH_PERFORMANCE=TRUE -DPAHO_WITH_SSL=TRUE -DPAHO_ENABLE_TESTING=FALSE -DOPENSSL_ROOT_DIR="C:\Program Files\OpenSSL-Win64" -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-[Linux] cmake .. -DPAHO_BUILD_SHARED=FALSE -DPAHO_BUILD_STATIC=TRUE -DPAHO_HIGH_PERFORMANCE=TRUE -DPAHO_WITH_SSL=TRUE -DPAHO_ENABLE_TESTING=FALSE -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-cmake --build . --target install --config "MinSizeRel"
+[macOS] cmake . -DPAHO_BUILD_SHARED=FALSE -DPAHO_BUILD_STATIC=TRUE -DPAHO_HIGH_PERFORMANCE=TRUE -DPAHO_WITH_SSL=TRUE -DPAHO_ENABLE_TESTING=FALSE -DOPENSSL_ROOT_DIR=$(brew --prefix openssl) -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON -B build
+[Windows] cmake . -DPAHO_BUILD_SHARED=FALSE -DPAHO_BUILD_STATIC=TRUE -DPAHO_HIGH_PERFORMANCE=TRUE -DPAHO_WITH_SSL=TRUE -DPAHO_ENABLE_TESTING=FALSE -DOPENSSL_ROOT_DIR="C:\Program Files\OpenSSL-Win64" -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON -B build
+[Linux] cmake . -DPAHO_BUILD_SHARED=FALSE -DPAHO_BUILD_STATIC=TRUE -DPAHO_HIGH_PERFORMANCE=TRUE -DPAHO_WITH_SSL=TRUE -DPAHO_ENABLE_TESTING=FALSE -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON -B build
+cmake --build build --target install --config "MinSizeRel"
 ```
 
 **paho.cpp**
 ```console
 git clone https://github.com/eclipse/paho.mqtt.cpp.git
 cd paho.mqtt.cpp
-mkdir build
-cd build
-[macOS] cmake .. -DPAHO_BUILD_SHARED=FALSE -DPAHO_BUILD_STATIC=TRUE -DPAHO_WITH_SSL=TRUE -DOPENSSL_ROOT_DIR=$(brew --prefix openssl) -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-[Windows] cmake .. -DPAHO_BUILD_SHARED=FALSE -DPAHO_BUILD_STATIC=TRUE -DPAHO_WITH_SSL=TRUE -DOPENSSL_ROOT_DIR="C:\Program Files\OpenSSL-Win64" -DPAHO_MQTT_C_INCLUDE_DIRS="C:\Program Files (x86)\Eclipse Paho C\include" -DPAHO_MQTT_C_LIBRARIES="C:\Program Files (x86)\Eclipse Paho C\lib" -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-[Linux] cmake .. -DPAHO_BUILD_SHARED=FALSE -DPAHO_BUILD_STATIC=TRUE -DPAHO_WITH_SSL=TRUE -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-cmake --build . --target install --config "MinSizeRel"
+[macOS] cmake . -DPAHO_BUILD_SHARED=FALSE -DPAHO_BUILD_STATIC=TRUE -DPAHO_WITH_SSL=TRUE -DOPENSSL_ROOT_DIR=$(brew --prefix openssl) -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON -B build
+[Windows] cmake . -DPAHO_BUILD_SHARED=FALSE -DPAHO_BUILD_STATIC=TRUE -DPAHO_WITH_SSL=TRUE -DOPENSSL_ROOT_DIR="C:\Program Files\OpenSSL-Win64" -DPAHO_MQTT_C_INCLUDE_DIRS="C:\Program Files (x86)\Eclipse Paho C\include" -DPAHO_MQTT_C_LIBRARIES="C:\Program Files (x86)\Eclipse Paho C\lib" -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON -B build
+[Linux] cmake . -DPAHO_BUILD_SHARED=FALSE -DPAHO_BUILD_STATIC=TRUE -DPAHO_WITH_SSL=TRUE -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON -B build
+cmake --build build --target install --config "MinSizeRel"
 ```
 
 ## Demo

demo/addons/GDPaho/GDPaho.gdextension

@@ -7,8 +7,8 @@ compatibility_minimum = "4.1"
 
 macos.debug = "res://addons/GDPaho/bin/macos/libgdpaho.debug.dylib"
 macos.release = "res://addons/GDPaho/bin/macos/libgdpaho.release.dylib"
-windows.debug.x86_64 = "res://addons/GDPaho/bin/windows/libgdpaho.debug.dll"
-windows.release.x86_64 = "res://addons/GDPaho/bin/windows/libgdpaho.release.dll"
+windows.debug.x86_64 = "res://addons/GDPaho/bin/win64/gdpaho.debug.dll"
+windows.release.x86_64 = "res://addons/GDPaho/bin/win64/gdpaho.release.dll"
 linux.debug.x86_64 = "res://addons/GDPaho/bin/x11/libgdpaho.debug.so"
 linux.release.x86_64 = "res://addons/GDPaho/bin/x11/libgdpaho.release.so"
 

demo/project.godot

@@ -23,6 +23,10 @@ GDPahoUtils="*res://addons/GDPaho/GDPahoUtils.gd"
 
 window/dpi/allow_hidpi=false
 
+[dotnet]
+
+project/assembly_name="GDPaho Demo"
+
 [editor_plugins]
 
 enabled=PackedStringArray("res://addons/GDPaho/plugin.cfg", "res://addons/easy_charts/plugin.cfg")

demo/scenes/MQTTPull.tscn

@@ -23,3 +23,5 @@ text = "Received data:"
 custom_minimum_size = Vector2(200, 25)
 layout_mode = 2
 text = "<no_data>"
+
+[connection signal="connected" from="." to="." method="_on_MQTTPull_connected"]

demo/scripts/MQTTPull.gd

@@ -14,7 +14,6 @@ func _on_MQTTClient_received(_topic: String, payload: String) -> void:
 		_data.text = "<empty>"
 	else:
 		_data.text = payload
-	print(payload)
 
 
 func _on_MQTTPull_connected(_reason_code: int) -> void: