CW Cyrix's Git Repository Mirror
Browse code

* Small Makefile changes.

* Removed a couple files that were not being used.
* Cleanups found with clang's -Weverything (and shutting it up about a
lot of things that were ridiculous, as well as ignoring some of the
warnings still coming up).

Naram Qashat authored on 2014/09/25 12:28:21
Showing 1 changed files
src/in_2sf/desmume/version.cpp
History View file @ ec120fe
... ... 
@@ -18,19 +18,6 @@
18 18 
 #include "version.h"
19 19 
 #include "types.h"
20 20
21 
-// Helper macros to convert numerics to strings
22 
-#ifdef _MSC_VER
23 
-// re: http://72.14.203.104/search?q=cache:HG-okth5NGkJ:mail.python.org/pipermail/python-checkins/2002-November/030704.html+_msc_ver+compiler+version+string&hl=en&gl=us&ct=clnk&cd=5
24 
-# define _Py_STRINGIZE(X) _Py_STRINGIZE1((X))
25 
-# define _Py_STRINGIZE1(X) _Py_STRINGIZE2 ## X
26 
-# define _Py_STRINGIZE2(X) #X
27 
-
28 
-# define TOSTRING(X) _Py_STRINGIZE(X) // Alias _Py_STRINGIZE so that we have a common macro name
29 
-#else
30 
-# define STRINGIFY(x) #x
31 
-# define TOSTRING(x) STRINGIFY(x)
32 
-#endif
33 
-
34 21 
 #define DESMUME_NAME "DeSmuME"
35 22
36 23 
 #if defined(__x86_64__) || defined(__LP64) || defined(__IA64__) || defined(_M_X64) || defined(_WIN64)
... ... 
@@ -61,31 +48,6 @@
61 48
62 49 
 #define DESMUME_SUBVERSION_STRING " svn 4608"
63 50
64 
-#ifdef __INTEL_COMPILER
65 
-# define DESMUME_COMPILER " (Intel)"
66 
-# define DESMUME_COMPILER_DETAIL " (Intel v" TOSTRING(__INTEL_COMPILER) ")"
67 
-#elif defined(_MSC_VER)
68 
-# define DESMUME_COMPILER " (MSVC)"
69 
-# define DESMUME_COMPILER_DETAIL " (MSVC v" TOSTRING(_MSC_VER) ")"
70 
-#elif defined(__clang__)
71 
-# define DESMUME_COMPILER " (LLVM-Clang)"
72 
-# define DESMUME_COMPILER_DETAIL " (LLVM-Clang v" TOSTRING(__clang_major__) "." TOSTRING(__clang_minor__) "." TOSTRING(__clang_patchlevel__) ")"
73 
-#elif defined(__llvm__)
74 
-# define DESMUME_COMPILER " (LLVM)"
75 
-# define DESMUME_COMPILER_DETAIL " (LLVM)"
76 
-#elif defined(__GNUC__) // Always make GCC the last check, since other compilers, such as Clang, may define __GNUC__ internally.
77 
-# define DESMUME_COMPILER " (GCC)"
78 
-
79 
-# if defined(__GNUC_PATCHLEVEL__)
80 
-#  define DESMUME_COMPILER_DETAIL " (GCC v" TOSTRING(__GNUC__) "." TOSTRING(__GNUC_MINOR__) "." TOSTRING(__GNUC_PATCHLEVEL__) ")"
81 
-# else
82 
-#  define DESMUME_COMPILER_DETAIL " (GCC v" TOSTRING(__GNUC__) "." TOSTRING(__GNUC_MINOR__) ")"
83 
-# endif
84 
-#else
85 
-# define DESMUME_COMPILER ""
86 
-# define DESMUME_COMPILER_DETAIL ""
87 
-#endif
88 
-
89 51 
 #ifdef HAVE_JIT
90 52 
 # define DESMUME_JIT "-JIT"
91 53 
 #else
Browse code

[2SF] Minor edit of a preprocessor line.

Naram Qashat authored on 2014/09/24 14:00:04
Showing 1 changed files
src/in_2sf/desmume/version.cpp
History View file @ 442e656
... ... 
@@ -19,7 +19,7 @@
19 19 
 #include "types.h"
20 20
21 21 
 // Helper macros to convert numerics to strings
22 
-#if defined(_MSC_VER)
22 
+#ifdef _MSC_VER
23 23 
 // re: http://72.14.203.104/search?q=cache:HG-okth5NGkJ:mail.python.org/pipermail/python-checkins/2002-November/030704.html+_msc_ver+compiler+version+string&hl=en&gl=us&ct=clnk&cd=5
24 24 
 # define _Py_STRINGIZE(X) _Py_STRINGIZE1((X))
25 25 
 # define _Py_STRINGIZE1(X) _Py_STRINGIZE2 ## X
Browse code

* Fixes for gcc and clang (while they can compile the code, the DLLs made aren't functional, but oh well).

* [2SF] Used more up-to-date asmjit, despite the ugly looking code.

Naram Qashat authored on 2014/09/17 19:51:45
Showing 1 changed files
src/in_2sf/desmume/version.cpp
History View file @ 9315374
... ... 
@@ -16,6 +16,7 @@
16 16 
 */
17 17
18 18 
 #include "version.h"
19 
+#include "types.h"
19 20
20 21 
 // Helper macros to convert numerics to strings
21 22 
 #if defined(_MSC_VER)
... ... 
@@ -91,8 +92,6 @@
91 92 
 # define DESMUME_JIT ""
92 93 
 #endif
93 94
94 
-#define DESMUME_VERSION_STRING " " "0.9.9" DESMUME_SUBVERSION_STRING DESMUME_PLATFORM_STRING DESMUME_JIT DESMUME_CPUEXT_STRING
95 
-#define DESMUME_NAME_AND_VERSION DESMUME_NAME DESMUME_VERSION_STRING
95 
+#define DESMUME_NAME_AND_VERSION DESMUME_NAME " 0.9.9" DESMUME_SUBVERSION_STRING DESMUME_PLATFORM_STRING DESMUME_JIT DESMUME_CPUEXT_STRING
96 96
97 
-const char *EMU_DESMUME_VERSION_STRING() { return DESMUME_VERSION_STRING; }
98 97 
 const char *EMU_DESMUME_NAME_AND_VERSION() { return DESMUME_NAME_AND_VERSION; }
Browse code

[2SF] Minor template removal.

Naram Qashat authored on 2014/09/08 13:53:30
Showing 1 changed files
src/in_2sf/desmume/version.cpp
History View file @ 7c32cf3
... ... 
@@ -32,7 +32,7 @@
32 32
33 33 
 #define DESMUME_NAME "DeSmuME"
34 34
35 
-#if defined(__x86_64__) || defined(__LP64) || defined(__IA64__) || defined(_M_X64) || defined(_WIN64)
35 
+#if defined(__x86_64__) || defined(__LP64) || defined(__IA64__) || defined(_M_X64) || defined(_WIN64)
36 36 
 # define DESMUME_PLATFORM_STRING " x64"
37 37 
 #elif defined(__i386__) || defined(_M_IX86) || defined(_WIN32)
38 38 
 # define DESMUME_PLATFORM_STRING " x86"
Browse code

Updated to latest DeSmuME SVN.

Naram Qashat authored on 2013/04/19 13:01:50
Showing 1 changed files
src/in_2sf/desmume/version.cpp
History View file @ 39d4cb5
... ... 
@@ -58,7 +58,7 @@
58 58 
 # define DESMUME_CPUEXT_STRING ""
59 59 
 #endif
60 60
61 
-#define DESMUME_SUBVERSION_STRING " svn 4605"
61 
+#define DESMUME_SUBVERSION_STRING " svn 4608"
62 62
63 63 
 #ifdef __INTEL_COMPILER
64 64 
 # define DESMUME_COMPILER " (Intel)"
Browse code

Slight update from DeSmuME SVN and a bit more code style cleanup of the AsmJit stuff, since I think it's code style is ugly.

Naram Qashat authored on 2013/04/19 12:45:47
Showing 1 changed files
src/in_2sf/desmume/version.cpp
History View file @ d07af85
... ... 
@@ -40,8 +40,10 @@
40 40 
 # define DESMUME_PLATFORM_STRING " ARM"
41 41 
 #elif defined(__thumb__)
42 42 
 # define DESMUME_PLATFORM_STRING " ARM-Thumb"
43 
+#elif defined(__ppc64__)
44 
+# define DESMUME_PLATFORM_STRING " PPC64"
43 45 
 #elif defined(__ppc__) || defined(_M_PPC)
44 
-# define DESMUME_PLATFORM_STRING " PowerPC"
46 
+# define DESMUME_PLATFORM_STRING " PPC"
45 47 
 #else
46 48 
 # define DESMUME_PLATFORM_STRING ""
47 49 
 #endif
... ... 
@@ -56,7 +58,7 @@
56 58 
 # define DESMUME_CPUEXT_STRING ""
57 59 
 #endif
58 60
59 
-#define DESMUME_SUBVERSION_STRING " svn 4598"
61 
+#define DESMUME_SUBVERSION_STRING " svn 4605"
60 62
61 63 
 #ifdef __INTEL_COMPILER
62 64 
 # define DESMUME_COMPILER " (Intel)"
Browse code

Updating in_2sf to use a newish version of DeSmuME, 0.9.9 from SVN. Somewhat cleaned up as well, but not everything because it's a pain in the ass.

Naram Qashat authored on 2013/04/18 17:22:55
Showing 1 changed files
src/in_2sf/desmume/version.cpp
History View file @ dfb7763
... ... 
@@ -1,5 +1,5 @@
1 1 
 /*
2 
-	Copyright (C) 2009-2011 DeSmuME team
2 
+	Copyright (C) 2009-2012 DeSmuME team
3 3
4 4 
 	This file is free software: you can redistribute it and/or modify
5 5 
 	it under the terms of the GNU General Public License as published by
... ... 
@@ -15,75 +15,82 @@
15 15 
 	along with the this software.  If not, see <http://www.gnu.org/licenses/>.
16 16 
 */
17 17
18 
-#include "types.h"
19 18 
 #include "version.h"
20 19
21 
-//todo - everyone will want to support this eventually, i suppose
22 
-/*#if defined(_WINDOWS) && !defined(WXPORT)
23 
-#include "svnrev.h"
24 
-#else*/
25 
-/*#ifdef SVN_REV
26 
-#define SVN_REV_STR SVN_REV
20 
+// Helper macros to convert numerics to strings
21 
+#if defined(_MSC_VER)
22 
+// re: http://72.14.203.104/search?q=cache:HG-okth5NGkJ:mail.python.org/pipermail/python-checkins/2002-November/030704.html+_msc_ver+compiler+version+string&hl=en&gl=us&ct=clnk&cd=5
23 
+# define _Py_STRINGIZE(X) _Py_STRINGIZE1((X))
24 
+# define _Py_STRINGIZE1(X) _Py_STRINGIZE2 ## X
25 
+# define _Py_STRINGIZE2(X) #X
26 
+
27 
+# define TOSTRING(X) _Py_STRINGIZE(X) // Alias _Py_STRINGIZE so that we have a common macro name
27 28 
 #else
28 
-#define SVN_REV_STR ""
29 
-#endif*/
30 
-//#endif
29 
+# define STRINGIFY(x) #x
30 
+# define TOSTRING(x) STRINGIFY(x)
31 
+#endif
31 32
32 33 
 #define DESMUME_NAME "DeSmuME"
33 34
34 
-#if defined(_WIN64)
35 
-#define DESMUME_PLATFORM_STRING " x64"
36 
-#elif defined(_WIN32)
37 
-#define DESMUME_PLATFORM_STRING " x86"
35 
+#if defined(__x86_64__) || defined(__LP64) || defined(__IA64__) || defined(_M_X64) || defined(_WIN64)
36 
+# define DESMUME_PLATFORM_STRING " x64"
37 
+#elif defined(__i386__) || defined(_M_IX86) || defined(_WIN32)
38 
+# define DESMUME_PLATFORM_STRING " x86"
39 
+#elif defined(__arm__)
40 
+# define DESMUME_PLATFORM_STRING " ARM"
41 
+#elif defined(__thumb__)
42 
+# define DESMUME_PLATFORM_STRING " ARM-Thumb"
43 
+#elif defined(__ppc__) || defined(_M_PPC)
44 
+# define DESMUME_PLATFORM_STRING " PowerPC"
38 45 
 #else
39 
-#define DESMUME_PLATFORM_STRING ""
46 
+# define DESMUME_PLATFORM_STRING ""
40 47 
 #endif
41 48
42 49 
 #ifndef ENABLE_SSE2
43 
-	#ifndef ENABLE_SSE
44 
-		#define DESMUME_CPUEXT_STRING " NOSSE"
45 
-	#else
46 
-		#define DESMUME_CPUEXT_STRING " NOSSE2"
47 
-	#endif
50 
+# ifndef ENABLE_SSE
51 
+#  define DESMUME_CPUEXT_STRING " NOSSE"
52 
+# else
53 
+#  define DESMUME_CPUEXT_STRING " NOSSE2"
54 
+# endif
48 55 
 #else
49 
-#define DESMUME_CPUEXT_STRING ""
56 
+# define DESMUME_CPUEXT_STRING ""
50 57 
 #endif
51 58
52 
-/*#ifdef DEVELOPER
53 
-#define DESMUME_FEATURE_STRING " dev+"
54 
-#else
55 
-#define DESMUME_FEATURE_STRING ""
56 
-#endif*/
59 
+#define DESMUME_SUBVERSION_STRING " svn 4598"
57 60
58 
-/*#if defined(DEBUG)
59 
-#define DESMUME_SUBVERSION_STRING " debug"
60 
-#elif defined(PUBLIC_RELEASE)
61 
-#define DESMUME_SUBVERSION_STRING ""
61 
+#ifdef __INTEL_COMPILER
62 
+# define DESMUME_COMPILER " (Intel)"
63 
+# define DESMUME_COMPILER_DETAIL " (Intel v" TOSTRING(__INTEL_COMPILER) ")"
64 
+#elif defined(_MSC_VER)
65 
+# define DESMUME_COMPILER " (MSVC)"
66 
+# define DESMUME_COMPILER_DETAIL " (MSVC v" TOSTRING(_MSC_VER) ")"
67 
+#elif defined(__clang__)
68 
+# define DESMUME_COMPILER " (LLVM-Clang)"
69 
+# define DESMUME_COMPILER_DETAIL " (LLVM-Clang v" TOSTRING(__clang_major__) "." TOSTRING(__clang_minor__) "." TOSTRING(__clang_patchlevel__) ")"
70 
+#elif defined(__llvm__)
71 
+# define DESMUME_COMPILER " (LLVM)"
72 
+# define DESMUME_COMPILER_DETAIL " (LLVM)"
73 
+#elif defined(__GNUC__) // Always make GCC the last check, since other compilers, such as Clang, may define __GNUC__ internally.
74 
+# define DESMUME_COMPILER " (GCC)"
75 
+
76 
+# if defined(__GNUC_PATCHLEVEL__)
77 
+#  define DESMUME_COMPILER_DETAIL " (GCC v" TOSTRING(__GNUC__) "." TOSTRING(__GNUC_MINOR__) "." TOSTRING(__GNUC_PATCHLEVEL__) ")"
78 
+# else
79 
+#  define DESMUME_COMPILER_DETAIL " (GCC v" TOSTRING(__GNUC__) "." TOSTRING(__GNUC_MINOR__) ")"
80 
+# endif
62 81 
 #else
63 
-#define DESMUME_SUBVERSION_STRING " svn" SVN_REV_STR
64 
-#endif*/
82 
+# define DESMUME_COMPILER ""
83 
+# define DESMUME_COMPILER_DETAIL ""
84 
+#endif
65 85
66 
-#if defined(__INTEL_COMPILER)
67 
-#define DESMUME_COMPILER " (Intel) "
68 
-//#define DESMUME_COMPILER_DETAIL " (Intel) "
69 
-#elif defined(_MSC_VER)
70 
-#define DESMUME_COMPILER ""
71 
-//#define DESMUME_COMPILER_DETAIL " msvc " _Py_STRINGIZE(_MSC_VER)
72 
-//#define _Py_STRINGIZE(X) _Py_STRINGIZE1((X))
73 
-//#define _Py_STRINGIZE1(X) _Py_STRINGIZE2 ## X
74 
-//#define _Py_STRINGIZE2(X) #X
75 
-//re: http://72.14.203.104/search?q=cache:HG-okth5NGkJ:mail.python.org/pipermail/python-checkins/2002-November/030704.html+_msc_ver+compiler+version+string&hl=en&gl=us&ct=clnk&cd=5
86 
+#ifdef HAVE_JIT
87 
+# define DESMUME_JIT "-JIT"
76 88 
 #else
77 
-// TODO: make for others compilers
78 
-#define DESMUME_COMPILER ""
79 
-//#define DESMUME_COMPILER_DETAIL ""
89 
+# define DESMUME_JIT ""
80 90 
 #endif
81 91
82 
-//#define DESMUME_VERSION_NUMERIC 90800
83 
-#define DESMUME_VERSION_STRING " 0.9.8" /*DESMUME_SUBVERSION_STRING*/ /*DESMUME_FEATURE_STRING*/ DESMUME_PLATFORM_STRING DESMUME_CPUEXT_STRING DESMUME_COMPILER
92 
+#define DESMUME_VERSION_STRING " " "0.9.9" DESMUME_SUBVERSION_STRING DESMUME_PLATFORM_STRING DESMUME_JIT DESMUME_CPUEXT_STRING
84 93 
 #define DESMUME_NAME_AND_VERSION DESMUME_NAME DESMUME_VERSION_STRING
85 94
86 
-//uint32_t EMU_DESMUME_VERSION_NUMERIC() { return DESMUME_VERSION_NUMERIC; }
87 
-const char* EMU_DESMUME_VERSION_STRING() { return DESMUME_VERSION_STRING; }
88 
-const char* EMU_DESMUME_NAME_AND_VERSION() { return DESMUME_NAME_AND_VERSION; }
89 
-//const char* EMU_DESMUME_COMPILER_DETAIL() { return DESMUME_COMPILER_DETAIL; }
95 
+const char *EMU_DESMUME_VERSION_STRING() { return DESMUME_VERSION_STRING; }
96 
+const char *EMU_DESMUME_NAME_AND_VERSION() { return DESMUME_NAME_AND_VERSION; }
Browse code

Import actual code.

Naram Qashat authored on 2013/03/26 02:41:19
Showing 1 changed files
src/in_2sf/desmume/version.cpp
History View file @ bc076aa
1 1 
new file mode 100644
... ... 
@@ -0,0 +1,89 @@
1 
+/*
2 
+	Copyright (C) 2009-2011 DeSmuME team
3 
+
4 
+	This file is free software: you can redistribute it and/or modify
5 
+	it under the terms of the GNU General Public License as published by
6 
+	the Free Software Foundation, either version 2 of the License, or
7 
+	(at your option) any later version.
8 
+
9 
+	This file is distributed in the hope that it will be useful,
10 
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
11 
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12 
+	GNU General Public License for more details.
13 
+
14 
+	You should have received a copy of the GNU General Public License
15 
+	along with the this software.  If not, see <http://www.gnu.org/licenses/>.
16 
+*/
17 
+
18 
+#include "types.h"
19 
+#include "version.h"
20 
+
21 
+//todo - everyone will want to support this eventually, i suppose
22 
+/*#if defined(_WINDOWS) && !defined(WXPORT)
23 
+#include "svnrev.h"
24 
+#else*/
25 
+/*#ifdef SVN_REV
26 
+#define SVN_REV_STR SVN_REV
27 
+#else
28 
+#define SVN_REV_STR ""
29 
+#endif*/
30 
+//#endif
31 
+
32 
+#define DESMUME_NAME "DeSmuME"
33 
+
34 
+#if defined(_WIN64)
35 
+#define DESMUME_PLATFORM_STRING " x64"
36 
+#elif defined(_WIN32)
37 
+#define DESMUME_PLATFORM_STRING " x86"
38 
+#else
39 
+#define DESMUME_PLATFORM_STRING ""
40 
+#endif
41 
+
42 
+#ifndef ENABLE_SSE2
43 
+	#ifndef ENABLE_SSE
44 
+		#define DESMUME_CPUEXT_STRING " NOSSE"
45 
+	#else
46 
+		#define DESMUME_CPUEXT_STRING " NOSSE2"
47 
+	#endif
48 
+#else
49 
+#define DESMUME_CPUEXT_STRING ""
50 
+#endif
51 
+
52 
+/*#ifdef DEVELOPER
53 
+#define DESMUME_FEATURE_STRING " dev+"
54 
+#else
55 
+#define DESMUME_FEATURE_STRING ""
56 
+#endif*/
57 
+
58 
+/*#if defined(DEBUG)
59 
+#define DESMUME_SUBVERSION_STRING " debug"
60 
+#elif defined(PUBLIC_RELEASE)
61 
+#define DESMUME_SUBVERSION_STRING ""
62 
+#else
63 
+#define DESMUME_SUBVERSION_STRING " svn" SVN_REV_STR
64 
+#endif*/
65 
+
66 
+#if defined(__INTEL_COMPILER)
67 
+#define DESMUME_COMPILER " (Intel) "
68 
+//#define DESMUME_COMPILER_DETAIL " (Intel) "
69 
+#elif defined(_MSC_VER)
70 
+#define DESMUME_COMPILER ""
71 
+//#define DESMUME_COMPILER_DETAIL " msvc " _Py_STRINGIZE(_MSC_VER)
72 
+//#define _Py_STRINGIZE(X) _Py_STRINGIZE1((X))
73 
+//#define _Py_STRINGIZE1(X) _Py_STRINGIZE2 ## X
74 
+//#define _Py_STRINGIZE2(X) #X
75 
+//re: http://72.14.203.104/search?q=cache:HG-okth5NGkJ:mail.python.org/pipermail/python-checkins/2002-November/030704.html+_msc_ver+compiler+version+string&hl=en&gl=us&ct=clnk&cd=5
76 
+#else
77 
+// TODO: make for others compilers
78 
+#define DESMUME_COMPILER ""
79 
+//#define DESMUME_COMPILER_DETAIL ""
80 
+#endif
81 
+
82 
+//#define DESMUME_VERSION_NUMERIC 90800
83 
+#define DESMUME_VERSION_STRING " 0.9.8" /*DESMUME_SUBVERSION_STRING*/ /*DESMUME_FEATURE_STRING*/ DESMUME_PLATFORM_STRING DESMUME_CPUEXT_STRING DESMUME_COMPILER
84 
+#define DESMUME_NAME_AND_VERSION DESMUME_NAME DESMUME_VERSION_STRING
85 
+
86 
+//uint32_t EMU_DESMUME_VERSION_NUMERIC() { return DESMUME_VERSION_NUMERIC; }
87 
+const char* EMU_DESMUME_VERSION_STRING() { return DESMUME_VERSION_STRING; }
88 
+const char* EMU_DESMUME_NAME_AND_VERSION() { return DESMUME_NAME_AND_VERSION; }
89 
+//const char* EMU_DESMUME_COMPILER_DETAIL() { return DESMUME_COMPILER_DETAIL; }