Changeset 20952
- Timestamp:
- 11/28/07 20:56:34 (1 year ago)
- Files:
-
- juggler/trunk/modules/gadgeteer/common.defs.mk.in (modified) (2 diffs)
- juggler/trunk/modules/gadgeteer/drivers/common.defs.mk.in (modified) (2 diffs)
- juggler/trunk/modules/gadgeteer/plugins/common.defs.mk.in (modified) (2 diffs)
- juggler/trunk/modules/jackal/common.defs.mk.in (modified) (2 diffs)
- juggler/trunk/modules/jackal/plugins/common.defs.mk.in (modified) (2 diffs)
- juggler/trunk/modules/sonix/common.defs.mk.in (modified) (2 diffs)
- juggler/trunk/modules/sonix/plugins/common.defs.mk.in (modified) (2 diffs)
- juggler/trunk/modules/tweek/common.defs.mk.in (modified) (2 diffs)
- juggler/trunk/modules/vapor/common.defs.mk.in (modified) (2 diffs)
- juggler/trunk/modules/vrjuggler/common.defs.mk.in (modified) (2 diffs)
- juggler/trunk/modules/vrjuggler/plugins/common.defs.mk.in (modified) (2 diffs)
- juggler/trunk/modules/vrjuggler/vrjconfig/common.defs.mk.in (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
juggler/trunk/modules/gadgeteer/common.defs.mk.in
r20951 r20952 383 383 LDOPTS+= -arch ppc $(PLATFORM_SDK) 384 384 endif 385 ifeq ($(ISA), i386)386 CFLAGS+= -arch i386 $(PLATFORM_SDK)387 CXXFLAGS+= -arch i386 $(PLATFORM_SDK)388 LDOPTS+= -arch i386 $(PLATFORM_SDK)389 endif390 ifeq ($(ISA), x86_64)391 CFLAGS+= -arch x86_64 $(PLATFORM_SDK)392 CXXFLAGS+= -arch x86_64 $(PLATFORM_SDK)393 LDOPTS+= -arch x86_64 $(PLATFORM_SDK)394 endif395 385 ifeq ($(ISA), universal) 396 386 CFLAGS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ … … 400 390 LDOPTS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 401 391 $(PLATFORM_SDK) 392 else 393 CFLAGS+= -arch $(ISA) $(PLATFORM_SDK) 394 CXXFLAGS+= -arch $(ISA) $(PLATFORM_SDK) 395 LDOPTS+= -arch $(ISA) $(PLATFORM_SDK) 402 396 endif 403 397 endif juggler/trunk/modules/gadgeteer/drivers/common.defs.mk.in
r18973 r20952 373 373 LDOPTS+= -arch ppc $(PLATFORM_SDK) 374 374 endif 375 ifeq ($(ISA), i386)376 CFLAGS+= -arch i386 $(PLATFORM_SDK)377 CXXFLAGS+= -arch i386 $(PLATFORM_SDK)378 LDOPTS+= -arch i386 $(PLATFORM_SDK)379 endif380 375 ifeq ($(ISA), universal) 381 376 CFLAGS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ … … 385 380 LDOPTS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 386 381 $(PLATFORM_SDK) 382 else 383 CFLAGS+= -arch $(ISA) $(PLATFORM_SDK) 384 CXXFLAGS+= -arch $(ISA) $(PLATFORM_SDK) 385 LDOPTS+= -arch $(ISA) $(PLATFORM_SDK) 387 386 endif 388 387 endif juggler/trunk/modules/gadgeteer/plugins/common.defs.mk.in
r18973 r20952 373 373 LDOPTS+= -arch ppc $(PLATFORM_SDK) 374 374 endif 375 ifeq ($(ISA), i386)376 CFLAGS+= -arch i386 $(PLATFORM_SDK)377 CXXFLAGS+= -arch i386 $(PLATFORM_SDK)378 LDOPTS+= -arch i386 $(PLATFORM_SDK)379 endif380 375 ifeq ($(ISA), universal) 381 376 CFLAGS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ … … 385 380 LDOPTS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 386 381 $(PLATFORM_SDK) 382 else 383 CFLAGS+= -arch $(ISA) $(PLATFORM_SDK) 384 CXXFLAGS+= -arch $(ISA) $(PLATFORM_SDK) 385 LDOPTS+= -arch $(ISA) $(PLATFORM_SDK) 387 386 endif 388 387 endif juggler/trunk/modules/jackal/common.defs.mk.in
r20951 r20952 373 373 LDOPTS+= -arch ppc $(PLATFORM_SDK) 374 374 endif 375 ifeq ($(ISA), i386)376 CFLAGS+= -arch i386 $(PLATFORM_SDK)377 CXXFLAGS+= -arch i386 $(PLATFORM_SDK)378 LDOPTS+= -arch i386 $(PLATFORM_SDK)379 endif380 ifeq ($(ISA), x86_64)381 CFLAGS+= -arch x86_64 $(PLATFORM_SDK)382 CXXFLAGS+= -arch x86_64 $(PLATFORM_SDK)383 LDOPTS+= -arch x86_64 $(PLATFORM_SDK)384 endif385 375 ifeq ($(ISA), universal) 386 376 CFLAGS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ … … 390 380 LDOPTS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 391 381 $(PLATFORM_SDK) 382 else 383 CFLAGS+= -arch $(ISA) $(PLATFORM_SDK) 384 CXXFLAGS+= -arch $(ISA) $(PLATFORM_SDK) 385 LDOPTS+= -arch $(ISA) $(PLATFORM_SDK) 392 386 endif 393 387 endif juggler/trunk/modules/jackal/plugins/common.defs.mk.in
r18971 r20952 373 373 LDOPTS+= -arch ppc $(PLATFORM_SDK) 374 374 endif 375 ifeq ($(ISA), i386)376 CFLAGS+= -arch i386 $(PLATFORM_SDK)377 CXXFLAGS+= -arch i386 $(PLATFORM_SDK)378 LDOPTS+= -arch i386 $(PLATFORM_SDK)379 endif380 375 ifeq ($(ISA), universal) 381 376 CFLAGS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ … … 385 380 LDOPTS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 386 381 $(PLATFORM_SDK) 382 else 383 CFLAGS+= -arch $(ISA) $(PLATFORM_SDK) 384 CXXFLAGS+= -arch $(ISA) $(PLATFORM_SDK) 385 LDOPTS+= -arch $(ISA) $(PLATFORM_SDK) 387 386 endif 388 387 endif juggler/trunk/modules/sonix/common.defs.mk.in
r20951 r20952 373 373 LDOPTS+= -arch ppc $(PLATFORM_SDK) 374 374 endif 375 ifeq ($(ISA), i386)376 CFLAGS+= -arch i386 $(PLATFORM_SDK)377 CXXFLAGS+= -arch i386 $(PLATFORM_SDK)378 LDOPTS+= -arch i386 $(PLATFORM_SDK)379 endif380 ifeq ($(ISA), x86_64)381 CFLAGS+= -arch x86_64 $(PLATFORM_SDK)382 CXXFLAGS+= -arch x86_64 $(PLATFORM_SDK)383 LDOPTS+= -arch x86_64 $(PLATFORM_SDK)384 endif385 375 ifeq ($(ISA), universal) 386 376 CFLAGS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ … … 390 380 LDOPTS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 391 381 $(PLATFORM_SDK) 382 else 383 CFLAGS+= -arch $(ISA) $(PLATFORM_SDK) 384 CXXFLAGS+= -arch $(ISA) $(PLATFORM_SDK) 385 LDOPTS+= -arch $(ISA) $(PLATFORM_SDK) 392 386 endif 393 387 endif juggler/trunk/modules/sonix/plugins/common.defs.mk.in
r18972 r20952 373 373 LDOPTS+= -arch ppc $(PLATFORM_SDK) 374 374 endif 375 ifeq ($(ISA), i386)376 CFLAGS+= -arch i386 $(PLATFORM_SDK)377 CXXFLAGS+= -arch i386 $(PLATFORM_SDK)378 LDOPTS+= -arch i386 $(PLATFORM_SDK)379 endif380 375 ifeq ($(ISA), universal) 381 376 CFLAGS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ … … 385 380 LDOPTS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 386 381 $(PLATFORM_SDK) 382 else 383 CFLAGS+= -arch $(ISA) $(PLATFORM_SDK) 384 CXXFLAGS+= -arch $(ISA) $(PLATFORM_SDK) 385 LDOPTS+= -arch $(ISA) $(PLATFORM_SDK) 387 386 endif 388 387 endif juggler/trunk/modules/tweek/common.defs.mk.in
r20951 r20952 373 373 LDOPTS+= -arch ppc $(PLATFORM_SDK) 374 374 endif 375 ifeq ($(ISA), i386)376 CFLAGS+= -arch i386 $(PLATFORM_SDK)377 CXXFLAGS+= -arch i386 $(PLATFORM_SDK)378 LDOPTS+= -arch i386 $(PLATFORM_SDK)379 endif380 ifeq ($(ISA), x86_64)381 CFLAGS+= -arch x86_64 $(PLATFORM_SDK)382 CXXFLAGS+= -arch x86_64 $(PLATFORM_SDK)383 LDOPTS+= -arch x86_64 $(PLATFORM_SDK)384 endif385 375 ifeq ($(ISA), universal) 386 376 CFLAGS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ … … 390 380 LDOPTS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 391 381 $(PLATFORM_SDK) 382 else 383 CFLAGS+= -arch $(ISA) $(PLATFORM_SDK) 384 CXXFLAGS+= -arch $(ISA) $(PLATFORM_SDK) 385 LDOPTS+= -arch $(ISA) $(PLATFORM_SDK) 392 386 endif 393 387 endif juggler/trunk/modules/vapor/common.defs.mk.in
r20951 r20952 373 373 LDOPTS+= -arch ppc $(PLATFORM_SDK) 374 374 endif 375 ifeq ($(ISA), i386)376 CFLAGS+= -arch i386 $(PLATFORM_SDK)377 CXXFLAGS+= -arch i386 $(PLATFORM_SDK)378 LDOPTS+= -arch i386 $(PLATFORM_SDK)379 endif380 ifeq ($(ISA), x86_64)381 CFLAGS+= -arch x86_64 $(PLATFORM_SDK)382 CXXFLAGS+= -arch x86_64 $(PLATFORM_SDK)383 LDOPTS+= -arch x86_64 $(PLATFORM_SDK)384 endif385 375 ifeq ($(ISA), universal) 386 376 CFLAGS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ … … 390 380 LDOPTS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 391 381 $(PLATFORM_SDK) 382 else 383 CFLAGS+= -arch $(ISA) $(PLATFORM_SDK) 384 CXXFLAGS+= -arch $(ISA) $(PLATFORM_SDK) 385 LDOPTS+= -arch $(ISA) $(PLATFORM_SDK) 392 386 endif 393 387 endif juggler/trunk/modules/vrjuggler/common.defs.mk.in
r20951 r20952 383 383 LDOPTS+= -arch ppc $(PLATFORM_SDK) 384 384 endif 385 ifeq ($(ISA), i386)386 CFLAGS+= -arch i386 $(PLATFORM_SDK)387 CXXFLAGS+= -arch i386 $(PLATFORM_SDK)388 LDOPTS+= -arch i386 $(PLATFORM_SDK)389 endif390 ifeq ($(ISA), x86_64)391 CFLAGS+= -arch x86_64 $(PLATFORM_SDK)392 CXXFLAGS+= -arch x86_64 $(PLATFORM_SDK)393 LDOPTS+= -arch x86_64 $(PLATFORM_SDK)394 endif395 385 ifeq ($(ISA), universal) 396 386 CFLAGS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ … … 400 390 LDOPTS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 401 391 $(PLATFORM_SDK) 392 else 393 CFLAGS+= -arch $(ISA) $(PLATFORM_SDK) 394 CXXFLAGS+= -arch $(ISA) $(PLATFORM_SDK) 395 LDOPTS+= -arch $(ISA) $(PLATFORM_SDK) 402 396 endif 403 397 endif juggler/trunk/modules/vrjuggler/plugins/common.defs.mk.in
r18974 r20952 373 373 LDOPTS+= -arch ppc $(PLATFORM_SDK) 374 374 endif 375 ifeq ($(ISA), i386)376 CFLAGS+= -arch i386 $(PLATFORM_SDK)377 CXXFLAGS+= -arch i386 $(PLATFORM_SDK)378 LDOPTS+= -arch i386 $(PLATFORM_SDK)379 endif380 375 ifeq ($(ISA), universal) 381 376 CFLAGS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ … … 385 380 LDOPTS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 386 381 $(PLATFORM_SDK) 382 else 383 CFLAGS+= -arch $(ISA) $(PLATFORM_SDK) 384 CXXFLAGS+= -arch $(ISA) $(PLATFORM_SDK) 385 LDOPTS+= -arch $(ISA) $(PLATFORM_SDK) 387 386 endif 388 387 endif juggler/trunk/modules/vrjuggler/vrjconfig/common.defs.mk.in
r18974 r20952 372 372 LDOPTS+= -arch ppc $(PLATFORM_SDK) 373 373 endif 374 ifeq ($(ISA), i386)375 CFLAGS+= -arch i386 $(PLATFORM_SDK)376 CXXFLAGS+= -arch i386 $(PLATFORM_SDK)377 LDOPTS+= -arch i386 $(PLATFORM_SDK)378 endif379 374 ifeq ($(ISA), universal) 380 CFLAGS+= -arch ppc -arch i386 $(PLATFORM_SDK) 381 CXXFLAGS+= -arch ppc -arch i386 $(PLATFORM_SDK) 382 LDOPTS+= -arch ppc -arch i386 $(PLATFORM_SDK) 383 endif 375 CFLAGS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 376 $(PLATFORM_SDK) 377 CXXFLAGS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 378 $(PLATFORM_SDK) 379 LDOPTS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 380 $(PLATFORM_SDK) 381 endif 382 else 383 CFLAGS+= -arch $(ISA) $(PLATFORM_SDK) 384 CXXFLAGS+= -arch $(ISA) $(PLATFORM_SDK) 385 LDOPTS+= -arch $(ISA) $(PLATFORM_SDK) 384 386 endif 385 387
