Move more to Makefile.common

Makefile

@@ -36,45 +36,11 @@ RETROLAUNCH_OBJ = tools/retrolaunch/main.o \
 
 HEADERS = $(wildcard */*/*.h) $(wildcard */*.h) $(wildcard *.h)
 
-ifeq ($(findstring Haiku,$(OS)),)
-   LIBS += -lm
-   DEBUG_FLAG = -g
-else
-   LIBS += -lroot -lnetwork
-   # stable and nightly haiku builds are stuck on gdb 6.x but we use gcc4
-   DEBUG_FLAG = -gdwarf-2
-endif
-
 ifeq ($(REENTRANT_TEST), 1)
    DEFINES += -Dmain=retroarch_main
    OBJ += console/test.o
 endif
 
-ifneq ($(findstring Darwin,$(OS)),)
-   OSX := 1
-   LIBS += -framework AppKit
-else
-   OSX := 0
-endif
-
-ifneq ($(findstring BSD,$(OS)),)
-   BSD_LOCAL_INC = -I/usr/local/include
-endif
-
-ifneq ($(findstring Linux,$(OS)),)
-   LIBS += -lrt
-   JOYCONFIG_LIBS += -lrt
-   OBJ += input/linuxraw_input.o input/linuxraw_joypad.o
-   JOYCONFIG_OBJ += tools/linuxraw_joypad.o
-endif
-
-ifeq ($(HAVE_NETPLAY), 1)
-   OBJ += netplay.o
-   ifneq ($(findstring Win32,$(OS)),)
-      LIBS += -lws2_32
-   endif
-endif
-
 ifeq ($(HAVE_OPENGL), 1)
    OBJ += gfx/gl.o \
 			 gfx/gfx_context.o \

Makefile.common

@@ -27,12 +27,45 @@ ifeq ($(HAVE_HARD_FLOAT), 1)
    DEFINES += -mfloat-abi=hard
 endif
 
+# System
+
+ifneq ($(findstring BSD,$(OS)),)
+   BSD_LOCAL_INC += -I/usr/local/include
+endif
+
+ifneq ($(findstring Darwin,$(OS)),)
+   OSX := 1
+   LIBS += -framework AppKit
+else
+   OSX := 0
+endif
+
+ifneq ($(findstring Linux,$(OS)),)
+   LIBS += -lrt
+   JOYCONFIG_LIBS += -lrt
+   OBJ += input/linuxraw_input.o input/linuxraw_joypad.o
+   JOYCONFIG_OBJ += tools/linuxraw_joypad.o
+endif
+
+ifeq ($(findstring Haiku,$(OS)),)
+   LIBS += -lm
+   DEBUG_FLAG = -g
+else
+   LIBS += -lroot -lnetwork
+   # stable and nightly haiku builds are stuck on gdb 6.x but we use gcc4
+   DEBUG_FLAG = -gdwarf-2
+endif
+
+# Git
+
 GIT_VERSION := $(shell git rev-parse --short HEAD 2>/dev/null)
 ifneq ($(GIT_VERSION),)
    DEFINES += -DHAVE_GIT_VERSION -DGIT_VERSION="\"$(GIT_VERSION)\""
    OBJ += git_version.o
 endif
 
+# General object files
+
 OBJ += frontend/frontend.o \
 		frontend/frontend_context.o \
 		frontend/platform/platform_null.o \
@@ -384,4 +417,12 @@ ifeq ($(HAVE_V4L2),1)
    DEFINES += -DHAVE_V4L2
 endif
 
-# Movie
+# Netplay
+
+ifeq ($(HAVE_NETPLAY), 1)
+   DEFINES += -DHAVE_NETPLAY -DHAVE_NETWORK_CMD
+   OBJ += netplay.o
+   ifneq ($(findstring Win32,$(OS)),)
+      LIBS += -lws2_32
+   endif
+endif

Makefile.emscripten

@@ -1,5 +1,6 @@
 TARGET = retroarch.js
 
+OS = Emscripten
 OBJ :=
 DEFINES := -DRARCH_INTERNAL -DHAVE_CC_RESAMPLER
 

Makefile.win

@@ -122,12 +122,6 @@ ifeq ($(HAVE_STDIN_CMD), 1)
    OBJ += command.o
 endif
 
-ifeq ($(HAVE_NETPLAY), 1)
-   DEFINES += -DHAVE_NETPLAY -DHAVE_NETWORK_CMD
-   OBJ += netplay.o
-   LIBS += -lws2_32
-endif
-
 ifeq ($(DYNAMIC), 1)
    DEFINES += -DHAVE_DYNAMIC
 else