Changeset 142 for trunk/libjdkmidi/trunk

Timestamp:

10/26/06 21:48:08 (2 years ago)

Author:

jeffk@…

Message:

magic.mak updated across projects

Files:

• trunk/libjdkmidi/trunk/magic.mak (modified) (10 diffs)

trunk/libjdkmidi/trunk/magic.mak

@@ -286 +286 @@
 
 # The preprocessor flags needed to generate dependency information:
-DEPENDENCY_OPTIONS?=-MM -MF
+DEPENDENCY_OPTIONS?=-MM 
 
 # native platform debug flags: having NATIVE_DEBUG set to 1 means we compile native platform
@@ -367 +367 @@
 # macosx_ppc is a subset of macosx and posix
 ifeq ($(TARGET_PLATFORM_MACOSX_PPC),1)
-SUFFIXES_TARGET_PLATFORM=POSIX MACOSX
+SUFFIXES_TARGET_PLATFORM=POSIX MACOSX MACOSX_PPC
 PLATFORM_DIRS+=posix macosx macosx-ppc
 endif
@@ -373 +373 @@
 # macosx_i386 is a subset of macosx and posix
 ifeq ($(TARGET_PLATFORM_MACOSX_I386),1)
-SUFFIXES_TARGET_PLATFORM=POSIX MACOSX
+SUFFIXES_TARGET_PLATFORM=POSIX MACOSX MACOSX_I386
 PLATFORM_DIRS+=posix macosx macosx-i386
 endif
@@ -379 +379 @@
 # macosx_universal is a subset of macosx and posix and uses mac libtool to generate fat binaries.
 ifeq ($(TARGET_PLATFORM_MACOSX_UNIVERSAL),1)
-SUFFIXES_TARGET_PLATFORM=POSIX MACOSX
+SUFFIXES_TARGET_PLATFORM=POSIX MACOSX MACOSX_UNIVERSAL
 PLATFORM_DIRS+=posix macosx macosx-ppc macosx-i386
 TARGET_MACOSX_SDK?=/Developer/SDKs/MacOSX10.4u.sdk
@@ -484 +484 @@
 
 ifeq ($(NATIVE_PLATFORM_MACOSX_PPC),1)
-SUFFIXES_NATIVE_PLATFORM=POSIX MACOSX
+SUFFIXES_NATIVE_PLATFORM=POSIX MACOSX MACOSX_PPC
 NATIVE_PLATFORM_GENERIC=0
 NATIVE_EXE=
@@ -491 +491 @@
 
 ifeq ($(NATIVE_PLATFORM_MACOSX_I386),1)
-SUFFIXES_NATIVE_PLATFORM=POSIX MACOSX
+SUFFIXES_NATIVE_PLATFORM=POSIX MACOSX MACOSX_I386
 NATIVE_PLATFORM_GENERIC=0
 NATIVE_EXE=
@@ -498 +498 @@
 
 ifeq ($(NATIVE_PLATFORM_MACOSX_UNIVERSAL),1)
-SUFFIXES_NATIVE_PLATFORM=POSIX MACOSX
+SUFFIXES_NATIVE_PLATFORM=POSIX MACOSX MACOSX_UNIVERSAL
 NATIVE_PLATFORM_GENERIC=0
 NATIVE_EXE=
@@ -636 +636 @@
 $(OUTPUT_OBJ_DIR)/%.o $(OUTPUT_OBJ_DIR)/%.d : %.mm
    @echo "CXX mm : $(notdir $<)"
-   @$(CXX) $(PREPROCESS_FLAGS) $(MMFLAGS) $(DEPENDENCY_OPTIONS) $(OUTPUT_OBJ_DIR)/$*.d $< && $(COMPILE.cpp) $(PREPROCESS_FLAGS) $(COMPILE_FLAGS) -o $(OUTPUT_OBJ_DIR)/$*.o $< 
+   @$(CXX) $(PREPROCESS_FLAGS) $(MMFLAGS) $(DEPENDENCY_OPTIONS) -MT '$(OUTPUT_OBJ_DIR)'/$*.o -MF $(OUTPUT_OBJ_DIR)/$*.d $< && $(COMPILE.cpp) $(PREPROCESS_FLAGS) $(COMPILE_FLAGS) -o $(OUTPUT_OBJ_DIR)/$*.o $< 
 
 # For Objective C:
 $(OUTPUT_OBJ_DIR)/%.o $(OUTPUT_OBJ_DIR)/%.d : %.m
    @echo "CC  m  : $(notdir $<)"
-   @$(CC) $(PREPROCESS_FLAGS)  $(MFLAGS) $(DEPENDENCY_OPTIONS) $(OUTPUT_OBJ_DIR)/$*.d $< &&  $(COMPILE.c) $(PREPROCESS_FLAGS) $(COMPILE_FLAGS) -o $(OUTPUT_OBJ_DIR)/$*.o $<
+   @$(CC) $(PREPROCESS_FLAGS)  $(MFLAGS) $(DEPENDENCY_OPTIONS) -MT  '$(OUTPUT_OBJ_DIR)'/$*.o -MF $(OUTPUT_OBJ_DIR)/$*.d $< && $(COMPILE.c) $(PREPROCESS_FLAGS) $(COMPILE_FLAGS) -o $(OUTPUT_OBJ_DIR)/$*.o $<
 
 # For C++: (cpp)
 $(OUTPUT_OBJ_DIR)/%.o $(OUTPUT_OBJ_DIR)/%.d : %.cpp
    @echo "CXX    : $(notdir $<)"
-   @$(CXX) $(PREPROCESS_FLAGS)  $(DEPENDENCY_OPTIONS) $(OUTPUT_OBJ_DIR)/$*.d $< && $(COMPILE.cpp) $(PREPROCESS_FLAGS) $(COMPILE_FLAGS) -o $(OUTPUT_OBJ_DIR)/$*.o $<
+   @$(CXX) $(PREPROCESS_FLAGS)  $(DEPENDENCY_OPTIONS) -MT '$(OUTPUT_OBJ_DIR)'/$*.o -MF $(OUTPUT_OBJ_DIR)/$*.d $< && $(COMPILE.cpp) $(PREPROCESS_FLAGS) $(COMPILE_FLAGS) -o $(OUTPUT_OBJ_DIR)/$*.o $<
 
 # For C++: (cc)
 $(OUTPUT_OBJ_DIR)/%.o $(OUTPUT_OBJ_DIR)/%.d : %.cc
    @echo "CXX    : $(notdir $<)"
-   @$(CXX) $(PREPROCESS_FLAGS)  $(DEPENDENCY_OPTIONS) $(OUTPUT_OBJ_DIR)/$*.d $< && $(COMPILE.cc) $(PREPROCESS_FLAGS) $(COMPILE_FLAGS) -o $(OUTPUT_OBJ_DIR)/$*.o $<
+   @$(CXX) $(PREPROCESS_FLAGS)  $(DEPENDENCY_OPTIONS) -MT  '$(OUTPUT_OBJ_DIR)'/$*.o -MF $(OUTPUT_OBJ_DIR)/$*.d $< && $(COMPILE.cc) $(PREPROCESS_FLAGS) $(COMPILE_FLAGS) -o $(OUTPUT_OBJ_DIR)/$*.o $<
 
 # For C:
 $(OUTPUT_OBJ_DIR)/%.o $(OUTPUT_OBJ_DIR)/%.d : %.c
    @echo "CC     : $(notdir $<)"
-   @$(CC) $(PREPROCESS_FLAGS)  $(DEPENDENCY_OPTIONS) $(OUTPUT_OBJ_DIR)/$*.d $< && $(COMPILE.c) $(PREPROCESS_FLAGS) $(COMPILE_FLAGS) -o $(OUTPUT_OBJ_DIR)/$*.o $<
+   @$(CC) $(PREPROCESS_FLAGS)  $(DEPENDENCY_OPTIONS) -MT  '$(OUTPUT_OBJ_DIR)'/$*.o -MF $(OUTPUT_OBJ_DIR)/$*.d $< && $(COMPILE.c) $(PREPROCESS_FLAGS) $(COMPILE_FLAGS) -o $(OUTPUT_OBJ_DIR)/$*.o $<
 
 
@@ -664 +664 @@
 $(NATIVE_OUTPUT_OBJ_DIR)/%.o $(NATIVE_OUTPUT_OBJ_DIR)/%.d : %.mm
    @echo "NATIVE_CXX mm : $(notdir $<)"
-   @$(NATIVE_CXX) $(NATIVE_PREPROCESS_FLAGS) $(DEPENDENCY_OPTIONS) $(NATIVE_OUTPUT_OBJ_DIR)/$*.d $< && $(NATIVE_COMPILE.mm) $(NATIVE_PREPROCESS_FLAGS) $(NATIVE_COMPILE_FLAGS) -o $(NATIVE_OUTPUT_OBJ_DIR)/$*.o $<
+   @$(NATIVE_CXX) $(NATIVE_PREPROCESS_FLAGS) $(DEPENDENCY_OPTIONS) '$(NATIVE_OUTPUT_OBJ_DIR)'/$*.o -MF $(NATIVE_OUTPUT_OBJ_DIR)/$*.d $< && $(NATIVE_COMPILE.mm) $(NATIVE_PREPROCESS_FLAGS) $(NATIVE_COMPILE_FLAGS) -o $(NATIVE_OUTPUT_OBJ_DIR)/$*.o $<
 
 $(NATIVE_OUTPUT_OBJ_DIR)/%.o $(NATIVE_OUTPUT_OBJ_DIR)/%.d : %.m
    @echo "NATIVE_CC  m  : $(notdir $<)"
-   @$(NATIVE_CC) $(NATIVE_PREPROCESS_FLAGS) $(DEPENDENCY_OPTIONS) $(NATIVE_OUTPUT_OBJ_DIR)/$*.d $< && $(NATIVE_COMPILE.m) $(NATIVE_PREPROCESS_FLAGS) $(NATIVE_COMPILE_FLAGS) -o $(NATIVE_OUTPUT_OBJ_DIR)/$*.o $<
+   @$(NATIVE_CC) $(NATIVE_PREPROCESS_FLAGS) $(DEPENDENCY_OPTIONS) -MT '$(NATIVE_OUTPUT_OBJ_DIR)'/$*.o -MF $(NATIVE_OUTPUT_OBJ_DIR)/$*.d $< && $(NATIVE_COMPILE.m) $(NATIVE_PREPROCESS_FLAGS) $(NATIVE_COMPILE_FLAGS) -o $(NATIVE_OUTPUT_OBJ_DIR)/$*.o $<
 
 $(NATIVE_OUTPUT_OBJ_DIR)/%.o $(NATIVE_OUTPUT_OBJ_DIR)/%.d : %.cpp
    @echo "NATIVE_CXX    : $(notdir $<)"
-   @$(NATIVE_CXX) $(NATIVE_PREPROCESS_FLAGS) $(DEPENDENCY_OPTIONS) $(NATIVE_OUTPUT_OBJ_DIR)/$*.d $< && $(NATIVE_COMPILE.cpp) $(NATIVE_PREPROCESS_FLAGS) $(NATIVE_COMPILE_FLAGS) -o $(NATIVE_OUTPUT_OBJ_DIR)/$*.o $<
+   @$(NATIVE_CXX) $(NATIVE_PREPROCESS_FLAGS) $(DEPENDENCY_OPTIONS) -MT '$(NATIVE_OUTPUT_OBJ_DIR)'/$*.o -MF $(NATIVE_OUTPUT_OBJ_DIR)/$*.d $< && $(NATIVE_COMPILE.cpp) $(NATIVE_PREPROCESS_FLAGS) $(NATIVE_COMPILE_FLAGS) -o $(NATIVE_OUTPUT_OBJ_DIR)/$*.o $<
 
 $(NATIVE_OUTPUT_OBJ_DIR)/%.o $(NATIVE_OUTPUT_OBJ_DIR)/%.d : %.cc
    @echo "NATIVE_CXX    : $(notdir $<)"
-   @$(NATIVE_CXX) $(NATIVE_PREPROCESS_FLAGS) $(DEPENDENCY_OPTIONS) $(NATIVE_OUTPUT_OBJ_DIR)/$*.d $< && $(NATIVE_COMPILE.cpp) $(NATIVE_PREPROCESS_FLAGS) $(NATIVE_COMPILE_FLAGS) -o $(NATIVE_OUTPUT_OBJ_DIR)/$*.o $<
+   @$(NATIVE_CXX) $(NATIVE_PREPROCESS_FLAGS) $(DEPENDENCY_OPTIONS) -MT  '$(NATIVE_OUTPUT_OBJ_DIR)'/$*.o -MF $(NATIVE_OUTPUT_OBJ_DIR)/$*.d $< && $(NATIVE_COMPILE.cpp) $(NATIVE_PREPROCESS_FLAGS) $(NATIVE_COMPILE_FLAGS) -o $(NATIVE_OUTPUT_OBJ_DIR)/$*.o $<
 
 $(NATIVE_OUTPUT_OBJ_DIR)/%.o $(NATIVE_OUTPUT_OBJ_DIR)/%.d : %.c
    @echo "NATIVE_CC     : $(notdir $<)"
-   @$(NATIVE_CC) $(NATIVE_PREPROCESS_FLAGS) $(DEPENDENCY_OPTIONS) $(NATIVE_OUTPUT_OBJ_DIR)/$*.d $< && $(NATIVE_COMPILE.c)  $(NATIVE_PREPROCESS_FLAGS) $(NATIVE_COMPILE_FLAGS) -o $(NATIVE_OUTPUT_OBJ_DIR)/$*.o $<
+   @$(NATIVE_CC) $(NATIVE_PREPROCESS_FLAGS) $(DEPENDENCY_OPTIONS) -MT -MF  '$(NATIVE_OUTPUT_OBJ_DIR)'/$*.d $(NATIVE_OUTPUT_OBJ_DIR)/$*.d $< && $(NATIVE_COMPILE.c)  $(NATIVE_PREPROCESS_FLAGS) $(NATIVE_COMPILE_FLAGS) -o $(NATIVE_OUTPUT_OBJ_DIR)/$*.o $<
 endif
 
@@ -1122 +1122 @@
 -include $(OUTPUT_OBJ_DIR)/*.d
 
-
-
-
-
-
+ifeq ($(CROSS_COMPILING),1)
+-include $(NATIVE_OUTPUT_OBJ_DIR)/*.d
+endif
+
+
+
+
+
+