Fix for windows build

diff --git a/tizen/src/Makefile.tizen b/tizen/src/Makefile.tizen
index c7f37ea1c4522adb62447bb35d562acef8ca1fda..857fdcf694a898348916e1a201e218a960fc8198 100644 (file)
--- a/tizen/src/Makefile.tizen
+++ b/tizen/src/Makefile.tizen
@@ -9,7 +9,11 @@ QEMU_CFLAGS += -I$(SRC_PATH)/tizen/distrib/ffmpeg/include
 QEMU_CFLAGS += -L$(SRC_PATH)/tizen/distrib/ffmpeg/lib
 QEMU_CFLAGS += $(SDL_CFLAGS)
 
+ifdef CONFIG_WIN32
+LIBS += -lavformat -lavcodec -lavutil -lm
+else
 LIBS += -lavformat -lavcodec -lavutil -lm -lGL
+endif
 
 # maru loader
 obj-y += emulator.o process.o maru_signal.o maru_sdl.o
@@ -38,11 +42,15 @@ endif
 
 
 # maru skin
-obj-i386-y += maruskin_client.o maruskin_server.o maruskin_operation.o maruskin_keymap.o
+obj-i386-y += maruskin_client.o maruskin_server.o maruskin_operation.o
+ifdef CONFIG_WIN32 
+obj-i386-y += maruskin_keymap.o
+endif
 
 # guest server
 obj-i386-y += guest_server.o 
 
+ifndef CONFIG_WIN32
 ##########################################################
 # opengl library for i386
 obj-i386-y += helper_opengl.o opengl_exec.o opengl_server.o
@@ -74,4 +82,5 @@ endif
 #gles2.o: gles2.c gles2.h gles2_calls.h
 
 ##########################################################
+endif
        

diff --git a/tizen/src/guest_server.c b/tizen/src/guest_server.c
index 36069d11cc3fcf81e92777ad9c7f61bb88648e27..a7d876329d8c6368a4572e97f1d0cb1907d04a7d 100644 (file)
--- a/tizen/src/guest_server.c
+++ b/tizen/src/guest_server.c
@@ -31,7 +31,15 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+
+#ifdef _WIN32
+#include <windows.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#else
 #include <arpa/inet.h>
+#endif
+
 #include "guest_server.h"
 #include "skin/maruskin_server.h"
 #include "debug_ch.h"
@@ -51,7 +59,7 @@ pthread_t start_guest_server( int server_port ) {
 
     svr_port = server_port;
 
-    pthread_t thread_id = -1;
+    pthread_t thread_id;
 
     if ( 0 != pthread_create( &thread_id, NULL, run_guest_server, NULL ) ) {
         ERR( "fail to create guest_server pthread.\n" );

diff --git a/tizen/src/maru_sdl.h b/tizen/src/maru_sdl.h
index 33a3dd7b6f7ee7ad928c099cc9356957d351e4f5..9ab855f181b4ed88d08791292fe1e93a6684d270 100644 (file)
--- a/tizen/src/maru_sdl.h
+++ b/tizen/src/maru_sdl.h
@@ -34,13 +34,11 @@
 #include "console.h"
 #ifndef _WIN32
 #include <SDL/SDL.h>
-#include <SDL/SDL_image.h>
 #include <SDL/SDL_syswm.h>
 #else
 #include <windows.h>
 #include <winbase.h>
 #include <SDL.h>
-#include <SDL_image.h>
 #include <SDL_syswm.h>
 #include <SDL_getenv.h>
 #endif

diff --git a/tizen/src/skin/maruskin_operation.c b/tizen/src/skin/maruskin_operation.c
index 661d42224a184d37d1d0e6153dfc3176ee7f5cce..185707da610ec8ae56a6b8735d477bdc42d89c46 100644 (file)
--- a/tizen/src/skin/maruskin_operation.c
+++ b/tizen/src/skin/maruskin_operation.c
@@ -33,11 +33,15 @@
 #include "maru_sdl.h"
 #include "debug_ch.h"
 #include "../hw/maru_pm.h"
-#include "maruskin_keymap.h"
+
 #include "console.h"
 #include "sdb.h"
 #include "nbd.h"
 
+#ifndef _WIN32
+#include "maruskin_keymap.h"
+#endif
+
 MULTI_DEBUG_CHANNEL(qemu, skin_operation);
 
 enum {
@@ -169,7 +173,7 @@ void do_rotation_event( int event_type) {
 
     INFO( "send to sendord(size: %d) 127.0.0.1:%d/tcp \n", buf_size, get_sdb_base_port() + SDB_TCP_EMULD_INDEX);
 #ifdef _WIN32
-    closiesocket( s );
+    closesocket( s );
 #else
     close( s );
 #endif

diff --git a/tizen/src/skin/maruskin_server.c b/tizen/src/skin/maruskin_server.c
index 5cb250871e33e2d1b45e42095a7c43c0a5b29b8b..a2735003e805961e151f0f50ec9886113fcdf299 100644 (file)
--- a/tizen/src/skin/maruskin_server.c
+++ b/tizen/src/skin/maruskin_server.c
@@ -31,10 +31,16 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+#ifdef _WIN32
+#include <windows.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#else
 #include <arpa/inet.h>
-#include <sys/types.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
+#endif
+#include <sys/types.h>
 #include <sys/time.h>
 #include <pthread.h>
 #include "maruskin_server.h"