fixup! fixup! New cdist/arm64 fixes.

[lwext4.git] / Makefile

diff --git a/Makefile b/Makefile
index 5cd1efb5d16a52cbf8dc97cf78c743d3fbe1fd03..e0f50d4c08f39f802b95fce288dbad5c18724a4b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,70 +19,83 @@ COMMON_DEFINITIONS =                                      \
        -DVERSION_MINOR=$(VERSION_MINOR)                      \
        -DVERSION_PATCH=$(VERSION_PATCH)                      \
        -DVERSION=$(VERSION)                                  \
-       -DLWEXT4_BUILD_SHARED_LIB=ON                          \
 
 define generate_common
        rm -R -f build_$(1)
        mkdir build_$(1)
        cd build_$(1) && cmake -G"Unix Makefiles"           \
        $(COMMON_DEFINITIONS)                               \
+       -DLWEXT4_BUILD_SHARED_LIB=ON                        \
+       $(2)                                                \
+       -DCMAKE_TOOLCHAIN_FILE=../toolchain/$(1).cmake ..
+endef
+
+define generate_common_static
+       rm -R -f build_$(1)
+       mkdir build_$(1)
+       cd build_$(1) && cmake -G"Unix Makefiles"           \
+       $(COMMON_DEFINITIONS)                               \
+       -DLWEXT4_BUILD_SHARED_LIB=OFF                       \
        $(2)                                                \
        -DCMAKE_TOOLCHAIN_FILE=../toolchain/$(1).cmake ..
 endef
 
 generic:
+       $(call generate_common_static,$@)
+
+osx:
        $(call generate_common,$@)
 
-osx:   
+osx32:
+       $(call generate_common,$@,-DCMAKE_OSX_ARCHITECTURES=i386)
+
+osx-arm64:
        $(call generate_common,$@)
 
 cortex-m0:
        $(call generate_common,$@)
-       
+
 cortex-m0+:
        $(call generate_common,$@)
-       
+
 cortex-m3:
        $(call generate_common,$@)
-       
+
 cortex-m4:
        $(call generate_common,$@)
-       
+
 cortex-m4f:
        $(call generate_common,$@)
-       
+
 cortex-m7:
        $(call generate_common,$@)
 
 arm-sim:
        $(call generate_common,$@)
 
-avrxmega7: 
+avrxmega7:
        $(call generate_common,$@)
 
 msp430:
        $(call generate_common,$@)
-       
+
 mingw:
        $(call generate_common,$@,-DWIN32=1)
-       
+
+mingw-32:
+       $(call generate_common,$@,-DWIN32=1)
+
 lib_only:
        rm -R -f build_lib_only
        mkdir build_lib_only
        cd build_lib_only && cmake $(COMMON_DEFINITIONS) -DLIB_ONLY=TRUE ..
 
-all: 
+all:
        generic
 
 clean:
        rm -R -f build_*
        rm -R -f ext_images
 
-       
-include fs_test.mk
-
 
-       
-
-       
-       
+include fs_test.mk