Browse Source

Add contributor credit. Mark AngelScript modifications.

Lasse Öörni 10 years ago
parent
commit
e6c8acdf40

+ 1 - 0
Docs/Urho3D.dox

@@ -93,6 +93,7 @@ Urho3D development, contributions and bugfixes by:
 - Mike3D
 - Mike3D
 - Modanung
 - Modanung
 - OvermindDL1
 - OvermindDL1
+- Skrylar
 - andmar1x
 - andmar1x
 - amadeus_osa
 - amadeus_osa
 - atship
 - atship

+ 1 - 0
README.md

@@ -47,6 +47,7 @@ Urho3D development, contributions and bugfixes by:
 - Mike3D
 - Mike3D
 - Modanung
 - Modanung
 - OvermindDL1
 - OvermindDL1
+- Skrylar
 - andmar1x
 - andmar1x
 - amadeus_osa
 - amadeus_osa
 - atship
 - atship

+ 2 - 0
Source/ThirdParty/AngelScript/source/as_callfunc_x86.cpp

@@ -28,6 +28,7 @@
    [email protected]
    [email protected]
 */
 */
 
 
+// Modified by Skrylar for Urho3D
 
 
 //
 //
 // as_callfunc_x86.cpp
 // as_callfunc_x86.cpp
@@ -1287,6 +1288,7 @@ endcopy:
 		"subl  $4, %%ecx       \n"
 		"subl  $4, %%ecx       \n"
 		"jne   copyloop3       \n"
 		"jne   copyloop3       \n"
 		"endcopy3:             \n"
 		"endcopy3:             \n"
+// Urho3D: modified to use a define set in as_config.h
 #ifdef AS_MINGW47_WORKAROUND
 #ifdef AS_MINGW47_WORKAROUND
         // MinGW made some strange choices with 4.7, and the thiscall calling convention
         // MinGW made some strange choices with 4.7, and the thiscall calling convention
         // when returning an object in memory is completely different from when not returning
         // when returning an object in memory is completely different from when not returning

+ 2 - 1
Source/ThirdParty/AngelScript/source/as_config.h

@@ -28,7 +28,7 @@
    [email protected]
    [email protected]
 */
 */
 
 
-// Modified by Yao Wei Tjong for Urho3D
+// Modified by Yao Wei Tjong and Skrylar for Urho3D
 
 
 
 
 //
 //
@@ -774,6 +774,7 @@
 			// As of version 4.7 MinGW changed the ABI, presumably
 			// As of version 4.7 MinGW changed the ABI, presumably
 
 
 			// to be better aligned with how MSVC works
 			// to be better aligned with how MSVC works
+			// Urho3D: also check for Clang version and use the same workaround 
 			#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || __GNUC__ > 4
 			#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || __GNUC__ > 4
 			    #define AS_MINGW47_WORKAROUND
 			    #define AS_MINGW47_WORKAROUND
 			#endif
 			#endif