From 2fb3842dd040715a792a8ec461c1818922a39c30 Mon Sep 17 00:00:00 2001 From: Edouard Dupin Date: Wed, 15 Aug 2012 12:07:28 +0200 Subject: [PATCH] a simple change of the folder of the Makefile --- Makefile.Android.mk | 2 +- Makefile.Linux.mk | 2 +- Makefile.Windows.mk | 9 +++++++++ {coreLinux => core}/clearvars.mk | 0 {coreLinux => core}/conf | Bin {coreLinux => core}/config.mk | 0 {coreLinux => core}/defs.mk | 0 {coreLinux => core}/executable.mk | 0 {coreLinux => core}/main.mk | 0 {coreLinux => core}/module.mk | 0 {coreLinux => core}/qconf | Bin {coreLinux => core}/rules.mk | 0 {coreLinux => core}/setup.mk | 3 +++ {coreLinux => core}/shared.mk | 0 {coreLinux => core}/static.mk | 0 {coreLinux => core}/warnings.mk | 0 16 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 Makefile.Windows.mk rename {coreLinux => core}/clearvars.mk (100%) rename {coreLinux => core}/conf (100%) rename {coreLinux => core}/config.mk (100%) rename {coreLinux => core}/defs.mk (100%) rename {coreLinux => core}/executable.mk (100%) rename {coreLinux => core}/main.mk (100%) rename {coreLinux => core}/module.mk (100%) rename {coreLinux => core}/qconf (100%) rename {coreLinux => core}/rules.mk (100%) rename {coreLinux => core}/setup.mk (99%) rename {coreLinux => core}/shared.mk (100%) rename {coreLinux => core}/static.mk (100%) rename {coreLinux => core}/warnings.mk (100%) diff --git a/Makefile.Android.mk b/Makefile.Android.mk index 9132d26..a23a095 100644 --- a/Makefile.Android.mk +++ b/Makefile.Android.mk @@ -38,7 +38,7 @@ ANDROID_BOARD_ID = 14 TARGET_GLOBAL_C_INCLUDES+=-I$(PROJECT_NDK)/platforms/android-$(ANDROID_BOARD_ID)/arch-arm/usr/include TARGET_GLOBAL_LDLIBS_SHARED = --sysroot=$(PROJECT_NDK)/platforms/android-$(ANDROID_BOARD_ID)/arch-arm -include $(EWOL_FOLDER)/Build/coreLinux/main.mk +include $(EWOL_FOLDER)/Build/core/main.mk java : all @mkdir -p libs/armeabi/ diff --git a/Makefile.Linux.mk b/Makefile.Linux.mk index 6d59f3d..e8a0971 100644 --- a/Makefile.Linux.mk +++ b/Makefile.Linux.mk @@ -1,7 +1,7 @@ USER_PACKAGES += $(EWOL_FOLDER)/Sources/ -include $(EWOL_FOLDER)/Build/coreLinux/main.mk +include $(EWOL_FOLDER)/Build/core/main.mk # http://alp.developpez.com/tutoriels/debian/creer-paquet/ diff --git a/Makefile.Windows.mk b/Makefile.Windows.mk new file mode 100644 index 0000000..4f4e7ac --- /dev/null +++ b/Makefile.Windows.mk @@ -0,0 +1,9 @@ + +USER_PACKAGES += $(EWOL_FOLDER)/Sources/ + +# defien the target OS of this system +TARGET_OS=Windows +# define the cross compilateur +CROSS=i586-mingw32msvc- + +include $(EWOL_FOLDER)/Build/core/main.mk diff --git a/coreLinux/clearvars.mk b/core/clearvars.mk similarity index 100% rename from coreLinux/clearvars.mk rename to core/clearvars.mk diff --git a/coreLinux/conf b/core/conf similarity index 100% rename from coreLinux/conf rename to core/conf diff --git a/coreLinux/config.mk b/core/config.mk similarity index 100% rename from coreLinux/config.mk rename to core/config.mk diff --git a/coreLinux/defs.mk b/core/defs.mk similarity index 100% rename from coreLinux/defs.mk rename to core/defs.mk diff --git a/coreLinux/executable.mk b/core/executable.mk similarity index 100% rename from coreLinux/executable.mk rename to core/executable.mk diff --git a/coreLinux/main.mk b/core/main.mk similarity index 100% rename from coreLinux/main.mk rename to core/main.mk diff --git a/coreLinux/module.mk b/core/module.mk similarity index 100% rename from coreLinux/module.mk rename to core/module.mk diff --git a/coreLinux/qconf b/core/qconf similarity index 100% rename from coreLinux/qconf rename to core/qconf diff --git a/coreLinux/rules.mk b/core/rules.mk similarity index 100% rename from coreLinux/rules.mk rename to core/rules.mk diff --git a/coreLinux/setup.mk b/core/setup.mk similarity index 99% rename from coreLinux/setup.mk rename to core/setup.mk index c30627e..a86b423 100644 --- a/coreLinux/setup.mk +++ b/core/setup.mk @@ -53,6 +53,9 @@ ifeq ("$(TARGET_OS)","Windows") ifeq ("$(STATIC)","1") TARGET_GLOBAL_LDFLAGS += -Wl,-Bstatic endif + + i586-mingw32msvc- + else ifeq ("$(TARGET_OS)","Android") TARGET_GLOBAL_CFLAGS += -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ \ -fpic -ffunction-sections -funwind-tables -fstack-protector \ diff --git a/coreLinux/shared.mk b/core/shared.mk similarity index 100% rename from coreLinux/shared.mk rename to core/shared.mk diff --git a/coreLinux/static.mk b/core/static.mk similarity index 100% rename from coreLinux/static.mk rename to core/static.mk diff --git a/coreLinux/warnings.mk b/core/warnings.mk similarity index 100% rename from coreLinux/warnings.mk rename to core/warnings.mk