dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'enhanced_viewport_overlay-sx' into jgrpp

Browse Source 
town_gui.cpp updated due to struct CommandContainer change.

Conflicts:
	src/command.cpp
	src/command_type.h
	src/gfxinit.cpp
	src/openttd.cpp
	src/pbs.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/stdafx.h
	src/train_cmd.cpp
	src/viewport_type.h
	src/window_type.h
This commit is contained in:
Jonathan G Rennison
2015-08-05 21:54:11 +01:00
parent 20e2f363f1 44d3c84a11
commit 7ed93f9211
110 changed files with 3527 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/stdafx.h
View File

@@ -525,4 +525,19 @@ static inline void free(const void *ptr)
#define OVERRIDE
#endif
/**
* Using _mm_prefetch() with gcc implies the compile flag -msse.
* This is not the case with __builtin_prefetch() so the latter can be used in normal .cpp files.
*/
#if defined(_MSC_VER)
#define INCLUDE_FOR_PREFETCH_NTA <xmmintrin.h>
#define PREFETCH_NTA(address) _mm_prefetch((const char *) (address), _MM_HINT_NTA);
#elif defined(__GNUC__)
#define INCLUDE_FOR_PREFETCH_NTA "stdafx.h"
#define PREFETCH_NTA(address) __builtin_prefetch((const void *) (address), 0, 0);
#else
#define INCLUDE_FOR_PREFETCH_NTA "stdafx.h"
#define PREFETCH_NTA(address)
#endif
#endif /* STDAFX_H */