Separate out Version.mm: faster compile.

diff --git a/MobileCydia.mm b/MobileCydia.mm
index bd5ddb936fe46cec2d63f122d916fcc27f062f68..f842c175042f9547b22b2abd051e010e799c85b7 100644 (file)
--- a/MobileCydia.mm
+++ b/MobileCydia.mm
@@ -208,8 +208,7 @@ void PrintTimes() {
 #define _end }
 /* }}} */
 
 #define _end }
 /* }}} */
 

-#include "Version.h"
-#define Cydia_ CYDIA_VERSION
+extern NSString *Cydia_;

 
 #define lprintf(args...) fprintf(stderr, args)
 
 
 #define lprintf(args...) fprintf(stderr, args)
 


@@ -3987,7 +3986,7 @@ static _H<NSMutableSet> Diversions_;
 }
 
 - (NSString *) version {
 }
 
 - (NSString *) version {

-    return @ Cydia_;
+    return Cydia_;

 }
 
 - (NSString *) device {
 }
 
 - (NSString *) device {


@@ -4594,7 +4593,7 @@ static _H<NSMutableSet> Diversions_;
 }
 
 - (NSString *) applicationNameForUserAgent {
 }
 
 - (NSString *) applicationNameForUserAgent {

-    NSString *application([NSString stringWithFormat:@"Cydia/%@", @ Cydia_]);
+    NSString *application([NSString stringWithFormat:@"Cydia/%@", Cydia_]);

 
     if (Safari_ != nil)
         application = [NSString stringWithFormat:@"Safari/%@ %@", Safari_, application];
 
     if (Safari_ != nil)
         application = [NSString stringWithFormat:@"Safari/%@ %@", Safari_, application];

diff --git a/Version.mm b/Version.mm
new file mode 100644 (file)
index 0000000..83f5982
--- /dev/null
+++ b/Version.mm
@@ -0,0 +1,3 @@
+#include <Foundation/Foundation.h>
+#include "Version.h"
+NSString *Cydia_ = @ CYDIA_VERSION;

diff --git a/makefile b/makefile
index 18dc376d020c289f5f9b3a57a3411510d5fd442f..293bc7629e8d4a8b542541a90e4ce2542f302783 100644 (file)
--- a/makefile
+++ b/makefile
@@ -67,7 +67,7 @@ dirs := Menes CyteKit Cydia SDURLCache
 
 code := $(foreach dir,$(dirs),$(wildcard $(foreach ext,h hpp c cpp m mm,$(dir)/*.$(ext))))
 code := $(filter-out SDURLCache/SDURLCacheTests.m,$(code))
 
 code := $(foreach dir,$(dirs),$(wildcard $(foreach ext,h hpp c cpp m mm,$(dir)/*.$(ext))))
 code := $(filter-out SDURLCache/SDURLCacheTests.m,$(code))

-code += MobileCydia.mm iPhonePrivate.h Cytore.hpp lookup3.c
+code += MobileCydia.mm Version.mm iPhonePrivate.h Cytore.hpp lookup3.c

 
 source := $(filter %.m,$(code)) $(filter %.mm,$(code))
 source += $(filter %.c,$(code)) $(filter %.cpp,$(code))
 
 source := $(filter %.m,$(code)) $(filter %.mm,$(code))
 source += $(filter %.c,$(code)) $(filter %.cpp,$(code))


@@ -106,7 +106,7 @@ Objects/%.o: %.mm $(header)
        @echo "[cycc] $<"
        @$(cycc) -c -o $@ $< $(flags) $(xflags)
 
        @echo "[cycc] $<"
        @$(cycc) -c -o $@ $< $(flags) $(xflags)
 

-Objects/MobileCydia.o: version.h
+Objects/Version.o: version.h

 
 Images/%.png: %.png
        @mkdir -p $(dir $@)
 
 Images/%.png: %.png
        @mkdir -p $(dir $@)