integrate from release branch

2009-06-16 05:50:48 +00:00 · 2009-06-16 05:50:48 +00:00 · 5b83d55092
parent ae6f134406
commit 5b83d55092
2 changed files with 3 additions and 0 deletions
--- a/desmume/src/matrix.h
+++ b/desmume/src/matrix.h
@ -21,6 +21,8 @@
 #ifndef MATRIX_H
 #define MATRIX_H

+#include <math.h>
+
 #include "types.h"

 extern "C" {
--- a/desmume/src/windows/defaultconfig/userconfig.h
+++ b/desmume/src/windows/defaultconfig/userconfig.h
@ -7,6 +7,7 @@

 //#define NOSSE2 //disables SSE2 optimizations (better change it in the vc++ codegen options too)
 //#define DEVELOPER //enables dev+ features
+//#define GDB_STUB //enables the gdb stub. for some reason this is separate from dev+ for now


 #endif //_USERCONFIG_H