teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-02-21 11:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't define getangle as __fastcall under Lunatic in order to avoid "Warning: resolving _getangle by linking to @getangle@8".

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6023 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-01-23 11:20:03 +00:00
parent 13c8ef2e93
commit 777d764702
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
polymer/eduke32/build/include/build.h
View file

@ -65,11 +65,13 @@ enum rendmode_t {
# define LUNATIC_CB ATTRIBUTE((used)) # define LUNATIC_CB ATTRIBUTE((used))
// Used for variables and functions referenced from Lua: // Used for variables and functions referenced from Lua:
# define LUNATIC_EXTERN ATTRIBUTE((used)) # define LUNATIC_EXTERN ATTRIBUTE((used))
# define LUNATIC_FASTCALL
#else #else
# ifdef NEW_MAP_FORMAT # ifdef NEW_MAP_FORMAT
# error "New map format can only be used with Lunatic" # error "New map format can only be used with Lunatic"
# endif # endif
# define LUNATIC_EXTERN static # define LUNATIC_EXTERN static
# define LUNATIC_FASTCALL __fastcall
#endif #endif
#define MAXWALLSB ((MAXWALLS>>2)+(MAXWALLS>>3)) #define MAXWALLSB ((MAXWALLS>>2)+(MAXWALLS>>3))
@ -1103,7 +1105,7 @@ int32_t krand(void);
#endif #endif
int32_t ksqrt(uint32_t num); int32_t ksqrt(uint32_t num);
int32_t __fastcall getangle(int32_t xvect, int32_t yvect); int32_t LUNATIC_FASTCALL getangle(int32_t xvect, int32_t yvect);
FORCE_INLINE uint32_t uhypsq(int32_t dx, int32_t dy) FORCE_INLINE uint32_t uhypsq(int32_t dx, int32_t dy)
{ {

2
polymer/eduke32/build/src/engine.c
View file

@ -10097,7 +10097,7 @@ int32_t inside(int32_t x, int32_t y, int16_t sectnum)
return -1; return -1;
} }
int32_t __fastcall getangle(int32_t xvect, int32_t yvect) int32_t LUNATIC_FASTCALL getangle(int32_t xvect, int32_t yvect)
{ {
int32_t rv; int32_t rv;

2
polymer/eduke32/source/lunatic/defs_common.lua
View file

@ -500,7 +500,7 @@ double gethiticks(void);
int32_t krand(void); int32_t krand(void);
int32_t ksqrt(uint32_t num); int32_t ksqrt(uint32_t num);
int32_t __fastcall getangle(int32_t xvect, int32_t yvect); int32_t getangle(int32_t xvect, int32_t yvect);
int32_t Mulscale(int32_t a, int32_t b, int32_t sh); int32_t Mulscale(int32_t a, int32_t b, int32_t sh);
]] ]]