< prev index next >

modules/javafx.media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.gobject

Print this page
@@ -9,11 +9,11 @@
  LIBFFI_DIR = ../../../$(THIRD_PARTY_DIR)/libffi
  
  DEP_DIRS = $(BUILD_DIR) $(OBJBASE_DIR)
  
  C_SOURCES = gatomicarray.c \
- 	    gbinding.c \
+ 	   gbinding.c \
              gboxed.c \
              gclosure.c \
              genums.c \
              gmarshal.c \
  	    gobject.c \

@@ -37,26 +37,26 @@
  
  INCLUDES = -I$(SRCBASE_DIR) \
             -I$(SRCBASE_DIR)/glib \
             -I$(SRCBASE_DIR)/gobject \
             -I$(SRCBASE_DIR)/build/win32/vs100 \
- 	   -I$(LIBFFI_DIR)/include
+ 	  -I$(LIBFFI_DIR)/include
  
  CFLAGS =   -DWIN32 \
             -D_WINDOWS \
             -D_USRDLL \
             -DGSTREAMER_LITE \
             -DGOBJECT_EXPORTS \
             -DGOBJECT_COMPILATION \
             -DHAVE_CONFIG_H \
             -DG_LOG_DOMAIN=\"Glib-GObject\" \
             -D_MBCS \
- 	   -DG_OS_WIN32 \
- 	   -DFFI_BUILDING \
+ 	  -DG_OS_WIN32 \
+ 	  -DFFI_BUILDING \
             -DG_DISABLE_DEPRECATED \
             $(INCLUDES) \
- 	   $(COMPILER_FLAGS)
+ 	  $(COMPILER_FLAGS)
  
  LIBFLAGS = -out:$(shell cygpath -ma $(TARGET)) -nologo
  
  ifeq ($(BUILD_TYPE), Release)
      CFLAGS += -DNDEBUG -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -O1 -Oy -MD -Gy -GF

@@ -65,15 +65,15 @@
      LIBFLAGS +=  -libpath:strmiids.lib
  endif
  
  ifeq ($(ARCH), x32)
      LIBFLAGS += -MACHINE:x86
-     INCLUDES += -I$(LIBFFI_DIR)/include/x86
+     INCLUDES += -I$(LIBFFI_DIR)/include/win/x86
  else
      CFLAGS += -D_WIN64
      LIBFLAGS += -MACHINE:x64
-     INCLUDES += -I$(LIBFFI_DIR)/include/x64
+     INCLUDES += -I$(LIBFFI_DIR)/include/win/x64
  endif
  
  OBJECTS = $(patsubst %.c,$(OBJBASE_DIR)/%.obj,$(C_SOURCES))
  
  .PHONY: default list
< prev index next >