Changeset 567 for trunk/Makefile

Timestamp:

02/09/11 13:24:53 (2 years ago)

Author:

CHDKLover

Message:

Neue Kamera wird vom CHDK-DE unterstützt (Alpha):

• s95 100e und 100h, danke waldo (v11) ​http://chdk.setepontos.com/index.php?topic=5641.0 ​http://chdk.setepontos.com/index.php?topic=5641.msg60957#msg60957

Neues Makro für stubs_entry_2.S:

WRAPPER(<Funktionsname>)
Ermöglicht die Deklaration von nicht gefundenen Funktionen in der "platform\<Kamera>\wrappers.c" (_<Funktionsname>) ohne Compilerfehler.
Zusätzlich ist in der "platform\<Kamera>\sub\<Firmwareversion>\stubs_asm.h" folgendes Makro zu definieren: "#define WRAPPER(name)"

File:

• trunk/Makefile (modified) (5 diffs)

trunk/Makefile

@@ -259 +259 @@
         $(MAKE) -s --no-print-directory PLATFORM=ixus120_sd940  PLATFORMSUB=102c NO_INC_BUILD=1 firzipsub
         $(MAKE) -s --no-print-directory PLATFORM=ixus120_sd940  PLATFORMSUB=103c NO_INC_BUILD=1 firzipsub
+        $(MAKE) -s --no-print-directory PLATFORM=s95  PLATFORMSUB=100e NO_INC_BUILD=1 firzipsub
+        $(MAKE) -s --no-print-directory PLATFORM=s95  PLATFORMSUB=100h NO_INC_BUILD=1 firzipsub
         @echo "**** All firmwares created successfully"
         @echo "**** Copying duplicate Firmwares"
@@ -315 +317 @@
         mv $(topdir)bin/$(VER)-ixus120_sd940-103c-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus120_sd940-102c-$(BUILD_NUMBER)_ALPHA.zip
         mv $(topdir)bin/$(VER)-ixus120_sd940-103c-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus120_sd940-103c-$(BUILD_NUMBER)_ALPHA.zip
+        mv $(topdir)bin/$(VER)-s95-100e-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-s95-100e-$(BUILD_NUMBER)_ALPHA.zip
+        mv $(topdir)bin/$(VER)-s95-100h-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-s95-100h-$(BUILD_NUMBER)_ALPHA.zip
         @echo "**** Done Copying duplicate Firmwares"
         @echo "**** Summary of memisosizes"
@@ -436 +440 @@
         $(MAKE) -s --no-print-directory PLATFORM=ixus120_sd940  PLATFORMSUB=102c NO_INC_BUILD=1 firzipsubcomplete
         $(MAKE) -s --no-print-directory PLATFORM=ixus120_sd940  PLATFORMSUB=103c NO_INC_BUILD=1 firzipsubcomplete
+        $(MAKE) -s --no-print-directory PLATFORM=s95  PLATFORMSUB=100e NO_INC_BUILD=1 firzipsubcomplete
+        $(MAKE) -s --no-print-directory PLATFORM=s95  PLATFORMSUB=100h NO_INC_BUILD=1 firzipsubcomplete
         @echo "**** All zipfiles including firmwares and extra stuff created successfully"
         @echo "**** Copying duplicate Firmwares"
@@ -546 +552 @@
         mv $(topdir)bin/ixus120_sd940-103c-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus120_sd940-103c-$(BUILD_NUMBER)-full_ALPHA.zip
         mv $(topdir)bin/ixus120_sd940-103c-$(BUILD_NUMBER).zip $(topdir)bin/ixus120_sd940-103c-$(BUILD_NUMBER)_ALPHA.zip
+        mv $(topdir)bin/s95-100e-$(BUILD_NUMBER)-full.zip $(topdir)bin/s95-100e-$(BUILD_NUMBER)-full_ALPHA.zip
+        mv $(topdir)bin/s95-100e-$(BUILD_NUMBER).zip $(topdir)bin/s95-100e-$(BUILD_NUMBER)_ALPHA.zip
+        mv $(topdir)bin/s95-100h-$(BUILD_NUMBER)-full.zip $(topdir)bin/s95-100h-$(BUILD_NUMBER)-full_ALPHA.zip
+        mv $(topdir)bin/s95-100h-$(BUILD_NUMBER).zip $(topdir)bin/s95-100h-$(BUILD_NUMBER)_ALPHA.zip
         @echo "**** Done Copying duplicate Firmwares"
         @echo "**** Summary of memisosizes"
@@ -665 +675 @@
         $(MAKE) -s --no-print-directory PLATFORM=ixus120_sd940  PLATFORMSUB=102c NO_INC_BUILD=1 clean
         $(MAKE) -s --no-print-directory PLATFORM=ixus120_sd940  PLATFORMSUB=103c NO_INC_BUILD=1 clean
+        $(MAKE) -s --no-print-directory PLATFORM=s95  PLATFORMSUB=100e NO_INC_BUILD=1 clean
+        $(MAKE) -s --no-print-directory PLATFORM=s95  PLATFORMSUB=100h NO_INC_BUILD=1 clean
         .PHONY: fir upload