Merge pull request microsoft#7726 from adrido/revert-irrlicht-unicode…

…-paths Revert "[irrlicht] use unicode path on windows (microsoft#7354)"
Enochack · Aug 16, 2019 · 1ccf986 · 1ccf986
2 parents b87dc54 + 073e0e4
commit 1ccf986
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 41 deletions.
diff --git a/ports/irrlicht/CMakeLists.txt b/ports/irrlicht/CMakeLists.txt
@@ -85,13 +85,6 @@ target_link_libraries(Irrlicht PRIVATE
     ${BZIP2_LIBRARY}
     )
 
-target_compile_definitions(Irrlicht PRIVATE
-    NO_IRR_USE_NON_SYSTEM_ZLIB_
-    NO_IRR_USE_NON_SYSTEM_LIB_PNG_
-    NO_IRR_USE_NON_SYSTEM_JPEG_LIB_
-    NO_IRR_USE_NON_SYSTEM_BZLIB_
-    )
-
 if(IRR_BUILD_TOOLS)
     add_executable(FileToHeader         ${IRR_TOOL_FILES_FILE_TO_HEADER})
 
@@ -151,9 +144,6 @@ endif()
 target_compile_definitions(Irrlicht PRIVATE IRRLICHT_EXPORTS)
 
 if(WIN32)
-    # Unicode
-    target_compile_definitions(Irrlicht PRIVATE UNICODE _UNICODE)
-
     # Import the symbols of bzip2
     target_compile_definitions(Irrlicht PRIVATE BZ_IMPORT)
 

diff --git a/ports/irrlicht/CONTROL b/ports/irrlicht/CONTROL
@@ -1,5 +1,5 @@
 Source: irrlicht
-Version: 1.8.4-2
+Version: 1.8.4-1
 Description: Irrlicht lightning fast 3d engine
 Build-Depends: zlib, libpng, bzip2, libjpeg-turbo
 

diff --git a/ports/irrlicht/portfile.cmake b/ports/irrlicht/portfile.cmake
@@ -22,8 +22,6 @@ vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE ${ARCHIVE}
     REF "1.8.4"
-    PATCHES
-        "support-unicode-on-windows.patch"
     # [NO_REMOVE_ONE_LEVEL]
     # [WORKING_DIRECTORY <${CURRENT_BUILDTREES_DIR}/src>]
     # [PATCHES <a.patch>...]

diff --git a/ports/irrlicht/support-unicode-on-windows.patch b/ports/irrlicht/support-unicode-on-windows.patch