[Orxonox-commit 3447] r8133 - in code/branches/mac_osx: cmake src

[youngk at orxonox.net]

Author: youngk
Date: 2011-03-27 00:21:55 +0100 (Sun, 27 Mar 2011)
New Revision: 8133

Modified:
   code/branches/mac_osx/cmake/PackageConfigOSX.cmake
   code/branches/mac_osx/src/Orxonox.cc
   code/branches/mac_osx/src/OrxonoxMac.h
   code/branches/mac_osx/src/OrxonoxMac.mm
Log:
Commiting adjustments done for kicklib, now also to mac_osx.

Modified: code/branches/mac_osx/cmake/PackageConfigOSX.cmake
===================================================================
--- code/branches/mac_osx/cmake/PackageConfigOSX.cmake	2011-03-26 20:55:08 UTC (rev 8132)
+++ code/branches/mac_osx/cmake/PackageConfigOSX.cmake	2011-03-26 23:21:55 UTC (rev 8133)
@@ -25,7 +25,7 @@
 
 INCLUDE(CheckPackageVersion)
 
-CHECK_PACKAGE_VERSION(1.0)
+CHECK_PACKAGE_VERSION(1.1)
 
 IF(NOT _INTERNAL_PACKAGE_MESSAGE)
   MESSAGE(STATUS "Using library package for the dependencies.")

Modified: code/branches/mac_osx/src/Orxonox.cc
===================================================================
--- code/branches/mac_osx/src/Orxonox.cc	2011-03-26 20:55:08 UTC (rev 8132)
+++ code/branches/mac_osx/src/Orxonox.cc	2011-03-26 23:21:55 UTC (rev 8133)
@@ -62,15 +62,16 @@
     {
 #ifndef ORXONOX_USE_WINMAIN
 
-// On Apples, the kernel supplies a second argument, which we have to circumvent
 #ifdef ORXONOX_PLATFORM_APPLE
-# define MAC_ARGC_HACK 2
+        // On Apples, the kernel supplies a second argument, which we have to circumvent
+        const int firstArgument = 2;
 #else
-# define MAC_ARGC_HACK 1
+        // 0 is the execution path
+        const int firstArgument = 1;
 #endif
-    
+        
         std::string strCmdLine;
-        for (int i = MAC_ARGC_HACK; i < argc; ++i)
+        for (int i = firstArgument; i < argc; ++i)
             strCmdLine = strCmdLine + argv[i] + ' ';
 #endif
 

Modified: code/branches/mac_osx/src/OrxonoxMac.h
===================================================================
--- code/branches/mac_osx/src/OrxonoxMac.h	2011-03-26 20:55:08 UTC (rev 8132)
+++ code/branches/mac_osx/src/OrxonoxMac.h	2011-03-26 23:21:55 UTC (rev 8133)
@@ -1,10 +1,30 @@
-//
-//  OrxonoxMac.h
-//  Orxonox
-//
-//  Created by Kevin Jonas Young on 14.03.11.
-//  Copyright 2011 -. All rights reserved.
-//
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *                    > www.orxonox.net <
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Kevin J. Young (youngk) 2011
+ *   Co-authors:
+ *      Fabian Landau (x3n)
+ *
+ */
 
 #import <Cocoa/Cocoa.h>
 

Modified: code/branches/mac_osx/src/OrxonoxMac.mm
===================================================================
--- code/branches/mac_osx/src/OrxonoxMac.mm	2011-03-26 20:55:08 UTC (rev 8132)
+++ code/branches/mac_osx/src/OrxonoxMac.mm	2011-03-26 23:21:55 UTC (rev 8133)
@@ -1,10 +1,30 @@
-//
-//  OrxonoxMac.mm
-//  Orxonox
-//
-//  Created by Kevin Jonas Young on 14.03.11.
-//  Copyright 2011 -. All rights reserved.
-//
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *                    > www.orxonox.net <
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Kevin J. Young (youngk) 2011
+ *   Co-authors:
+ *      Fabian Landau (x3n)
+ *
+ */
 
 #import "OrxonoxMac.h"