binding-mri/binding-mri.cpp

@@ -20,11 +20,11 @@
 */
 
 #include "binding.h"
-#include "binding-util.h"
+#include "util.h"
+#include "binding-util.h"  //fatal error C1189 if this is before "util.h"
 #include "sharedstate.h"
 #include "eventthread.h"
 #include "filesystem.h"
-#include "util.h"
 #include "sdl-util.h"
 #include "debugwriter.h"
 #include "graphics.h"

binding-mri/binding-util.cpp

@@ -19,11 +19,11 @@
 ** along with mkxp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "binding-util.h"
+#include "util.h"
+#include "binding-util.h" //fatal error C1189 if this is before "util.h"
 
 #include "sharedstate.h"
 #include "exception.h"
-#include "util.h"
 
 #include <stdarg.h>
 #include <string.h>

binding-mri/etc-binding.cpp

@@ -19,6 +19,10 @@
 ** along with mkxp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifdef _MSC_VER
+#define _CRT_SECURE_NO_DEPRECATE
+#endif
+
 #include "etc.h"
 #include "binding-util.h"
 #include "serializable-binding.h"

binding-mri/filesystem-binding.cpp

@@ -19,11 +19,10 @@
 ** along with mkxp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "binding-util.h"
+#include "util.h"
-
+#include "binding-util.h" //fatal error C1189 if this is before "util.h"
 #include "sharedstate.h"
 #include "filesystem.h"
-#include "util.h"
 
 #include "ruby/encoding.h"
 #include "ruby/intern.h"

binding-mri/font-binding.cpp

@@ -19,6 +19,10 @@
 ** along with mkxp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifdef _MSC_VER
+#define _CRT_SECURE_NO_DEPRECATE
+#endif
+
 #include "font.h"
 #include "binding-util.h"
 #include "binding-types.h"

binding-mri/input-binding.cpp

@@ -19,6 +19,10 @@
 ** along with mkxp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifdef _MSC_VER
+#define _CRT_SECURE_NO_DEPRECATE
+#endif
+
 #include "input.h"
 #include "sharedstate.h"
 #include "exception.h"

binding-mri/table-binding.cpp

@@ -19,6 +19,10 @@
 ** along with mkxp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifdef _MSC_VER
+#define NOMINMAX
+#endif
+
 #include <algorithm>
 #include "table.h"
 #include "binding-util.h"

patches/SDL_sound/ima-adpcm.patch

@@ -186,7 +186,7 @@ diff -r 719dade41745 decoders/wav.c
 +                break;
 +
 +            rc = read_ima_block_headers(internal->rw, fmt->fmt.ima.d,
-+                                        fmt->wChannels, (Sint16*) (out_buf+bw));
++                                        fmt->wChannels, (Sint16*)out_buf+bw);
 +                                        
 +            if (!rc)
 +            {
@@ -210,7 +210,7 @@ diff -r 719dade41745 decoders/wav.c
 +        if (bw+fmt->fmt.ima.dec_frameset_size > internal->buffer_size)
 +            break;
 +
-+        rc = read_ima_frameset(internal->rw, w, (Sint16*) (out_buf+bw));
++        rc = read_ima_frameset(internal->rw, w, (Sint16*)out_buf+bw);
 +
 +        if (!rc)
 +        {

src/alstream.cpp

@@ -19,6 +19,7 @@
 ** along with mkxp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "crossplatform.h"
 #include "alstream.h"
 
 #include "sharedstate.h"

src/crossplatform.h

@@ -0,0 +1,7 @@
+#ifdef _MSC_VER
+#define snprintf _snprintf
+
+#include <direct.h>
+
+#define chdir _chdir
+#endif

src/eventthread.cpp

@@ -19,6 +19,7 @@
 ** along with mkxp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "crossplatform.h"
 #include "eventthread.h"
 
 #include <SDL_events.h>

src/exception.h

@@ -22,6 +22,9 @@
 #ifndef EXCEPTION_H
 #define EXCEPTION_H
 
+#ifdef _MSC_VER
+#define _CRT_SECURE_NO_DEPRECATE
+#endif
 #include <string>
 #include <stdio.h>
 #include <stdarg.h>

src/filesystem.cpp

@@ -19,6 +19,7 @@
 ** along with mkxp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "crossplatform.h"
 #include "filesystem.h"
 
 #include "rgssad.h"

src/graphics.cpp

@@ -43,7 +43,9 @@
 #include <SDL_image.h>
 
 #include <time.h>
+#ifndef _MSC_VER
 #include <sys/time.h>
+#endif
 #include <errno.h>
 #include <algorithm>
 

src/keybindings.cpp

@@ -19,6 +19,7 @@
 ** along with mkxp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "crossplatform.h"
 #include "keybindings.h"
 
 #include "config.h"

src/main.cpp

@@ -26,11 +26,14 @@
 #include <SDL_ttf.h>
 #include <SDL_sound.h>
 
+#ifndef _MSC_VER
 #include <unistd.h>
+#endif
 #include <string.h>
 #include <assert.h>
 #include <string>
 
+#include "crossplatform.h"
 #include "sharedstate.h"
 #include "eventthread.h"
 #include "gl-debug.h"
@@ -357,4 +360,4 @@ int main(int argc, char *argv[])
 	SDL_Quit();
 
 	return 0;
-}
+}

src/sdl-util.h

@@ -44,7 +44,11 @@ int __sdlThreadFun(void *obj)
 template<class C, void (C::*func)()>
 SDL_Thread *createSDLThread(C *obj, const std::string &name = std::string())
 {
+#ifdef _MSC_VER
+	return SDL_CreateThread((__sdlThreadFun<C, func>), name.c_str(), obj);
+#else
 	return SDL_CreateThread(__sdlThreadFun<C, func>, name.c_str(), obj);
+#endif
 }
 
 /* On Android, SDL_RWFromFile always opens files from inside

src/settingsmenu.cpp

@@ -19,6 +19,7 @@
 ** along with mkxp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "crossplatform.h"
 #include "settingsmenu.h"
 
 #include <SDL_video.h>

src/sharedstate.cpp

@@ -38,7 +38,9 @@
 #include "exception.h"
 #include "sharedmidistate.h"
 
+#ifndef _MSC_VER
 #include <unistd.h>
+#endif
 #include <stdio.h>
 #include <string>
 

src/soundemitter.cpp

@@ -19,6 +19,7 @@
 ** along with mkxp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "crossplatform.h"
 #include "soundemitter.h"
 
 #include "sharedstate.h"

src/util.h

@@ -22,6 +22,9 @@
 #ifndef UTIL_H
 #define UTIL_H
 
+#ifdef _MSC_VER
+#define _CRT_SECURE_NO_DEPRECATE
+#endif
 #include <stdio.h>
 #include <string>
 #include <algorithm>

src/vorbissource.cpp

@@ -19,6 +19,9 @@
 ** along with mkxp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifdef _MSC_VER
+#include <algorithm>
+#endif
 #include "aldatasource.h"
 #include "exception.h"