Merge 4a40835f71 into df24b24c44

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Geode Changelog
 
+## v4.0.1
+ * Add cutoff constructor for CCRenderTexture (#1171)
+
 ## v4.0.0
  * Make chosen display type in mod list be saved between startups (07d92a3)
  * Fix `Task::all` not returning results in order (227adb0)

VERSION

@@ -1 +1 @@
-4.0.0
+4.0.1

cmake/GeodeFile.cmake

@@ -164,7 +164,27 @@ function(setup_geode_mod proname)
         set(HAS_HEADERS Off)
     endif()
 
-    if (HAS_HEADERS AND WIN32)
+    if (GEODE_BUNDLE_PDB AND WIN32 AND (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
+        if (HAS_HEADERS)
+            add_custom_target(${proname}_PACKAGE ALL
+                DEPENDS ${proname} ${CMAKE_CURRENT_SOURCE_DIR}/mod.json
+                COMMAND ${GEODE_CLI} package new ${CMAKE_CURRENT_SOURCE_DIR} 
+                    --binary $<TARGET_FILE:${proname}> $<TARGET_LINKER_FILE:${proname}> $<TARGET_PDB_FILE:${proname}>
+                    --output ${CMAKE_CURRENT_BINARY_DIR}/${MOD_ID}.geode
+                    ${INSTALL_ARG} ${PDB_ARG}
+                VERBATIM USES_TERMINAL
+            )
+        else()
+            add_custom_target(${proname}_PACKAGE ALL
+                DEPENDS ${proname} ${CMAKE_CURRENT_SOURCE_DIR}/mod.json
+                COMMAND ${GEODE_CLI} package new ${CMAKE_CURRENT_SOURCE_DIR} 
+                    --binary $<TARGET_FILE:${proname}> $<TARGET_PDB_FILE:${proname}>
+                    --output ${CMAKE_CURRENT_BINARY_DIR}/${MOD_ID}.geode
+                    ${INSTALL_ARG} ${PDB_ARG}
+                VERBATIM USES_TERMINAL
+            )
+        endif()
+    elseif (HAS_HEADERS AND WIN32)
         # this adds the .lib file on windows, which is needed for linking with the headers
         add_custom_target(${proname}_PACKAGE ALL
             DEPENDS ${proname} ${CMAKE_CURRENT_SOURCE_DIR}/mod.json

loader/include/Geode/cocos/misc_nodes/CCRenderTexture.h

@@ -61,6 +61,8 @@ class CC_DLL CCRenderTexture : public CCNode
     */
     CC_PROPERTY(CCSprite*, m_pSprite, Sprite)
 public:
+    GEODE_CUSTOM_CONSTRUCTOR_COCOS(CCRenderTexture, CCNode)
+
     /**
      * @js ctor
      */

loader/include/Geode/cocos/support/zip_support/ZipUtils.h

@@ -155,12 +155,12 @@ namespace cocos2d
         static gd::string base64EncodeEnc(gd::string const&, gd::string);
         static gd::string base64URLDecode(gd::string const&);
         static gd::string base64URLEncode(gd::string const&);
-        static int ccDeflateMemory(unsigned char*, unsigned int, unsigned char**);
+        static int ccDeflateMemory(unsigned char* data, unsigned int size, unsigned char** out);
         static int ccDeflateMemoryWithHint(unsigned char*, unsigned int, unsigned char**, unsigned int);
-        static gd::string compressString(gd::string const&, bool, int);
-        static gd::string decompressString(gd::string const&, bool, int);
-        static gd::string decompressString2(unsigned char*, bool, int, int);
-        static gd::string encryptDecrypt(gd::string const&, int);
+        static gd::string compressString(gd::string const& data, bool encrypt, int encryptionKey);
+        static gd::string decompressString(gd::string const& data, bool encrypt, int encryptionKey);
+        static gd::string decompressString2(unsigned char* data, bool encrypt, int size, int encryptionKey);
+        static gd::string encryptDecrypt(gd::string const& data, int encryptionKey);
         static gd::string encryptDecryptWKey(gd::string const&, gd::string);
         static unsigned char hexToChar(const gd::string&);
         static gd::string urlDecode(const gd::string&);