Changeset 94 for trunk/libjdkmidi/trunk

Timestamp:

08/24/06 14:09:09 (2 years ago)

Author:

jeffk@…

Message:

better support for cross compiling - native and target src files can be different. top dir extracted automatically without using relative paths

Location:

trunk/libjdkmidi/trunk

Files:

• configure (modified) (2 diffs)
• magic.mak (modified) (9 diffs)

trunk/libjdkmidi/trunk/configure

@@ -64 +64 @@
 
 
-
 params=$((
   for i in "$@"
@@ -80 +79 @@
 
 magic_PROJECT_TOP_DIR="${magic_PROJECT_TOP_DIR:-${PWD}/${relative_dir}}"
+magic_PROJECT_TOP_DIR=$(cd "${magic_PROJECT_TOP_DIR}" && pwd)
 magic_PREFIX="${magic_PREFIX:-${PWD}/install}"
 magic_INSTALL_DIR="${magic_PREFIX}"

trunk/libjdkmidi/trunk/magic.mak

@@ -249 +249 @@
 NATIVE_OUTPUT_LIB?=$(NATIVE_OUTPUT_LIB_DIR)/lib$(PROJECT).a
 
+
+NATIVE_LIB_SRC_DIR+=$(addsuffix /src,$(LIB_DIRS)) $(foreach platform,$(NATIVE_PLATFORM_DIRS),$(addsuffix /src/$(platform),$(LIB_DIRS)))
+NATIVE_LIB_TESTS_DIR+=$(addsuffix /tests,$(LIB_DIRS)) $(foreach platform,$(NATIVE_PLATFORM_DIRS),$(addsuffix /tests/$(platform),$(LIB_DIRS)))
+NATIVE_LIB_EXAMPLES_DIR+=$(addsuffix /examples,$(LIB_DIRS)) $(foreach platform,$(NATIVE_PLATFORM_DIRS),$(addsuffix /examples/$(platform),$(LIB_DIRS)))
+NATIVE_LIB_TOOLS_DIR+=$(addsuffix /tools,$(LIB_DIRS)) $(foreach platform,$(NATIVE_PLATFORM_DIRS),$(addsuffix /tools/$(platform),$(LIB_DIRS)))
+
+
 endif
 
@@ -257 +264 @@
 LIB_TOOLS_DIR+=$(addsuffix /tools,$(LIB_DIRS)) $(foreach platform,$(PLATFORM_DIRS),$(addsuffix /tools/$(platform),$(LIB_DIRS)))
 LIB_DOCS_DIR+=$(addsuffix /docs,$(LIB_DIRS))
+
 
 BUILD_DIR=$(PWD)
@@ -436 +444 @@
 
 ifeq ($(CROSS_COMPILING),1)
-NATIVE_LIB_O_FILES=$(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(LIB_CPP_FILES:.cpp=.o)) $(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(LIB_C_FILES:.c=.o)) $(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(LIB_M_FILES:.m=.o)) $(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(LIB_MM_FILES:.mm=.o))
+NATIVE_LIB_CPP_FILES=$(notdir $(foreach dir,$(NATIVE_LIB_SRC_DIR),$(wildcard $(dir)/*.cpp))) 
+NATIVE_LIB_C_FILES=$(notdir $(foreach dir,$(NATIVE_LIB_SRC_DIR),$(wildcard $(dir)/*.c))) 
+NATIVE_LIB_M_FILES=$(notdir $(foreach dir,$(NATIVE_LIB_SRC_DIR),$(wildcard $(dir)/*.m))) 
+NATIVE_LIB_MM_FILES=$(notdir $(foreach dir,$(NATIVE_LIB_SRC_DIR),$(wildcard $(dir)/*.mm))) 
+
+NATIVE_LIB_O_FILES=$(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(NATIVE_LIB_CPP_FILES:.cpp=.o)) $(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(NATIVE_LIB_C_FILES:.c=.o)) $(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(NATIVE_LIB_M_FILES:.m=.o)) $(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(NATIVE_LIB_MM_FILES:.mm=.o))
 endif
 
@@ -448 +461 @@
 LIB_TOOLS_O_FILES=$(addprefix $(OUTPUT_OBJ_DIR)/,$(LIB_TOOLS_CPP_FILES:.cpp=.o)) $(addprefix $(OUTPUT_OBJ_DIR)/,$(LIB_TOOLS_C_FILES:.c=.o)) $(addprefix $(OUTPUT_OBJ_DIR)/,$(LIB_TOOLS_M_FILES:.m=.o)) $(addprefix $(OUTPUT_OBJ_DIR)/,$(LIB_TOOLS_MM_FILES:.mm=.o))
 LIB_TOOLS_EXE_FILES=$(addprefix $(OUTPUT_TOOLS_DIR)/,$(notdir $(LIB_TOOLS_O_FILES:.o=$(EXE))))
-ifeq ($(CROSS_COMPILING),1)
-NATIVE_LIB_TOOLS_O_FILES=$(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(NATIVE_LIB_TOOLS_CPP_FILES:.cpp=.o)) $(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(NATIVE_LIB_TOOLS_C_FILES:.c=.o)) $(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(NATIVE_LIB_TOOLS_M_FILES:.m=.o)) $(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(LIB_TOOLS_MM_FILES:.mm=.o))
+
+ifeq ($(CROSS_COMPILING),1)
+NATIVE_LIB_TOOLS_CPP_FILES=$(notdir $(foreach dir,$(NATIVE_LIB_TOOLS_DIR),$(wildcard $(dir)/*.cpp))) 
+NATIVE_LIB_TOOLS_C_FILES=$(notdir $(foreach dir,$(NATIVE_LIB_TOOLS_DIR),$(wildcard $(dir)/*.c))) 
+NATIVE_LIB_TOOLS_M_FILES=$(notdir $(foreach dir,$(NATIVE_LIB_TOOLS_DIR),$(wildcard $(dir)/*.m))) 
+NATIVE_LIB_TOOLS_MM_FILES=$(notdir $(foreach dir,$(NATIVE_LIB_TOOLS_DIR),$(wildcard $(dir)/*.mm))) 
+
+NATIVE_LIB_TOOLS_O_FILES=$(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(NATIVE_LIB_TOOLS_CPP_FILES:.cpp=.o)) $(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(NATIVE_LIB_TOOLS_C_FILES:.c=.o)) $(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(NATIVE_LIB_TOOLS_M_FILES:.m=.o)) $(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(NATIVE_LIB_TOOLS_MM_FILES:.mm=.o))
 NATIVE_LIB_TOOLS_EXE_FILES=$(addprefix $(NATIVE_OUTPUT_TOOLS_DIR)/,$(notdir $(NATIVE_LIB_TOOLS_O_FILES:.o=$(NATIVE_EXE))))
 endif
@@ -461 +480 @@
 LIB_TESTS_EXE_FILES=$(addprefix $(OUTPUT_TESTS_DIR)/,$(notdir $(LIB_TESTS_O_FILES:.o=$(EXE))))
 
-LIB_TESTS_SH_FILES=$(foreach dir,$(LIB_TESTS_DIR),$(wildcard $(dir)/*.sh)) $(foreach platform,$(PLATFORM_DIRS),$(foreach dir,$(LIB_TESTS_DIR),$(wildcard $(dir)/$(platform)/*.sh)))
-ifeq ($(CROSS_COMPILING),1)
-NATIVE_LIB_TESTS_O_FILES=$(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(LIB_TESTS_CPP_FILES:.cpp=.o)) $(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(LIB_TESTS_C_FILES:.c=.o)) $(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(LIB_TESTS_M_FILES:.m=.o)) $(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(LIB_TESTS_MM_FILES:.mm=.o))
+LIB_TESTS_SH_FILES=$(foreach dir,$(NATIVE_LIB_TESTS_DIR),$(wildcard $(dir)/*.sh)) $(foreach platform,$(PLATFORM_DIRS),$(foreach dir,$(LIB_TESTS_DIR),$(wildcard $(dir)/$(platform)/*.sh)))
+
+ifeq ($(CROSS_COMPILING),1)
+NATIVE_LIB_TESTS_CPP_FILES=$(notdir $(foreach dir,$(NATIVE_LIB_TESTS_DIR),$(wildcard $(dir)/*.cpp))) 
+NATIVE_LIB_TESTS_C_FILES=$(notdir $(foreach dir,$(NATIVE_LIB_TESTS_DIR),$(wildcard $(dir)/*.c))) 
+NATIVE_LIB_TESTS_M_FILES=$(notdir $(foreach dir,$(NATIVE_LIB_TESTS_DIR),$(wildcard $(dir)/*.m))) 
+NATIVE_LIB_TESTS_MM_FILES=$(notdir $(foreach dir,$(NATIVE_LIB_TESTS_DIR),$(wildcard $(dir)/*.mm))) 
+
+NATIVE_LIB_TESTS_O_FILES=$(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(NATIVE_LIB_TESTS_CPP_FILES:.cpp=.o)) $(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(NATIVE_LIB_TESTS_C_FILES:.c=.o)) $(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(NATIVE_LIB_TESTS_M_FILES:.m=.o)) $(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(NATIVE_LIB_TESTS_MM_FILES:.mm=.o))
 NATIVE_LIB_TESTS_EXE_FILES=$(addprefix $(NATIVE_OUTPUT_TESTS_DIR)/,$(notdir $(NATIVE_LIB_TESTS_O_FILES:.o=$(NATIVE_EXE))))
 NATIVE_LIB_TESTS_SH_FILES=$(foreach dir,$(NATIVE_LIB_TESTS_DIR),$(wildcard $(dir)/*.sh)) $(foreach platform,$(NATIVE_PLATFORM_DIRS),$(foreach dir,$(NATIVE_LIB_TESTS_DIR),$(wildcard $(dir)/$(platform)/*.sh)))
@@ -477 +502 @@
 LIB_EXAMPLES_O_FILES=$(addprefix $(OUTPUT_OBJ_DIR)/,$(LIB_EXAMPLES_CPP_FILES:.cpp=.o)) $(addprefix $(OUTPUT_OBJ_DIR)/,$(LIB_EXAMPLES_C_FILES:.c=.o)) $(addprefix $(OUTPUT_OBJ_DIR)/,$(LIB_EXAMPLES_M_FILES:.m=.o)) $(addprefix $(OUTPUT_OBJ_DIR)/,$(LIB_EXAMPLES_MM_FILES:.mm=.o))
 LIB_EXAMPLES_EXE_FILES=$(addprefix $(OUTPUT_EXAMPLES_DIR)/,$(notdir $(LIB_EXAMPLES_O_FILES:.o=$(EXE))))
-ifeq ($(CROSS_COMPILING),1)
-NATIVE_LIB_EXAMPLES_O_FILES=$(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(LIB_EXAMPLES_CPP_FILES:.cpp=.o)) $(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(LIB_EXAMPLES_C_FILES:.c=.o)) $(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(LIB_EXAMPLES_M_FILES:.m=.o)) $(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(LIB_EXAMPLES_MM_FILES:.mm=.o))
+
+ifeq ($(CROSS_COMPILING),1)
+NATIVE_LIB_EXAMPLES_CPP_FILES=$(notdir $(foreach dir,$(NATIVE_LIB_EXAMPLES_DIR),$(wildcard $(dir)/*.cpp)))  
+NATIVE_LIB_EXAMPLES_C_FILES=$(notdir $(foreach dir,$(NATIVE_LIB_EXAMPLES_DIR),$(wildcard $(dir)/*.c)))  
+NATIVE_LIB_EXAMPLES_M_FILES=$(notdir $(foreach dir,$(NATIVE_LIB_EXAMPLES_DIR),$(wildcard $(dir)/*.m)))  
+NATIVE_LIB_EXAMPLES_MM_FILES=$(notdir $(foreach dir,$(NATIVE_LIB_EXAMPLES_DIR),$(wildcard $(dir)/*.mm)))  
+
+NATIVE_LIB_EXAMPLES_O_FILES=$(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(NATIVE_LIB_EXAMPLES_CPP_FILES:.cpp=.o)) $(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(NATIVE_LIB_EXAMPLES_C_FILES:.c=.o)) $(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(NATIVE_LIB_EXAMPLES_M_FILES:.m=.o)) $(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(NATIVE_LIB_EXAMPLES_MM_FILES:.mm=.o))
 NATIVE_LIB_EXAMPLES_EXE_FILES=$(addprefix $(NATIVE_OUTPUT_EXAMPLES_DIR)/,$(notdir $(NATIVE_LIB_EXAMPLES_O_FILES:.o=$(EXE))))
 endif
@@ -676 +707 @@
    @echo '  (--cflags) echo $(CFLAGS) $(CONFIG_TOOL_COMPILE_FLAGS);;' >>$(CONFIG_TOOL_FILE)
    @echo '  (--cxxflags) echo $(CXXFLAGS) $(CONFIG_TOOL_COMPILE_FLAGS);;' >>$(CONFIG_TOOL_FILE)
-   @echo '  (--cppflags) echo $(PREPROCESS_FLAGS);;' >>$(CONFIG_TOOL_FILE)
+   @echo '  (--cppflags) echo $(addprefix -D,$(DEFINES));;' >>$(CONFIG_TOOL_FILE)
    @echo '  (--mflags) echo $(MFLAGS) $(CONFIG_TOOL_COMPILE_FLAGS);;' >>$(CONFIG_TOOL_FILE)
    @echo '  (--mmflags) echo $(MMFLAGS) $(CONFIG_TOOL_COMPILE_FLAGS);;' >>$(CONFIG_TOOL_FILE)
@@ -693 +724 @@
    @echo "LDLIBS: $(LDLIBS)"
    @echo "OUTPUT_LIB: $(OUTPUT_LIB)"   
+   @echo "LIB_DIRS: $(LIB_DIRS)"
    @echo "LIB_INCLUDE_DIR: $(LIB_INCLUDE_DIR)"
    @echo "LIB_SRC_DIR: $(LIB_SRC_DIR)"
@@ -721 +753 @@
    @echo "NATIVE_LDLIBS: $(NATIVE_LDLIBS)"
    @echo "NATIVE_OUTPUT_LIB: $(NATIVE_OUTPUT_LIB)"
+   @echo "NATIVE_LIB_SRC_DIR: $(NATIVE_LIB_SRC_DIR)"
+   @echo "NATIVE_LIB_TOOLS_DIR: $(NATIVE_LIB_TOOLS_DIR)"
 endif