summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-07-20 08:50:43 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-07-20 08:54:53 (GMT)
commit4a34df5d9861041aa7c984b55d2df13d7cb0e7d1 (patch)
tree14b32e7df2b81272c861aab272c56d38465d3d91
parentaa0ac51645e60c13ade46abed036207d0969c294 (diff)
downloadswift-4a34df5d9861041aa7c984b55d2df13d7cb0e7d1.zip
swift-4a34df5d9861041aa7c984b55d2df13d7cb0e7d1.tar.bz2
Use Objective-C++ in main.
-rw-r--r--Makefile2
-rw-r--r--Slimber/Cocoa/.gitignore1
-rw-r--r--Slimber/Cocoa/main.m6
-rw-r--r--Slimber/Cocoa/main.mm5
4 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 85127f3..fe9602a 100644
--- a/Makefile
+++ b/Makefile
@@ -108,7 +108,7 @@ endif
$(QUIET_CXX)$(CXX) -c $< -o $@ $(CPPFLAGS) $(CXXFLAGS)
%.o: %.mm
- $(QUIET_CC)$(CC) -c $< -o $@ $(CPPFLAGS) $(CXXFLAGS)
+ $(QUIET_CXX)$(CXX) -x objective-c++ -c $< -o $@ $(CPPFLAGS) $(CXXFLAGS)
%.o: %.m
$(QUIET_CC)$(CC) -c $< -o $@ $(CPPFLAGS) $(CFLAGS)
diff --git a/Slimber/Cocoa/.gitignore b/Slimber/Cocoa/.gitignore
index 51d15c3..66f3f9e 100644
--- a/Slimber/Cocoa/.gitignore
+++ b/Slimber/Cocoa/.gitignore
@@ -2,3 +2,4 @@ build
*.mode1v3
*.pbxuser
Slimber
+PkgInfo
diff --git a/Slimber/Cocoa/main.m b/Slimber/Cocoa/main.m
deleted file mode 100644
index 1e887a0..0000000
--- a/Slimber/Cocoa/main.m
+++ /dev/null
@@ -1,6 +0,0 @@
-#import <Cocoa/Cocoa.h>
-
-int main(int argc, char *argv[])
-{
- return NSApplicationMain(argc, (const char **) argv);
-}
diff --git a/Slimber/Cocoa/main.mm b/Slimber/Cocoa/main.mm
new file mode 100644
index 0000000..b7266b5
--- /dev/null
+++ b/Slimber/Cocoa/main.mm
@@ -0,0 +1,5 @@
+#include <Cocoa/Cocoa.h>
+
+int main(int argc, char *argv[]) {
+ return NSApplicationMain(argc, const_cast<const char **>(argv));
+}