Changeset 2664 for code/branches/buildsystem3/src/cpptcl

Timestamp:

Feb 14, 2009, 10:53:45 PM (16 years ago)

Author:

rgrieder

Message:

Merged buildsystem2 to buildsystem3.

Note: Bare merge, just resolved conflicts. To testing, no nothing.

Location:

code/branches/buildsystem3

Files:

• . (modified) (2 props)
• src/cpptcl/CHANGES (copied) (copied from code/branches/buildsystem2/src/cpptcl/CHANGES)
• src/cpptcl/CMakeLists.txt (modified) (1 diff)
• src/cpptcl/CppTcl.cc (deleted)
• src/cpptcl/CppTcl.h (deleted)
• src/cpptcl/changes_orxonox.diff (copied) (copied from code/branches/buildsystem2/src/cpptcl/changes_orxonox.diff)
• src/cpptcl/cpptcl.cc (copied) (copied from code/branches/buildsystem2/src/cpptcl/cpptcl.cc)
• src/cpptcl/cpptcl.h (copied) (copied from code/branches/buildsystem2/src/cpptcl/cpptcl.h)

code/branches/buildsystem3/src/cpptcl/CMakeLists.txt

@@ -1 @@
-ADD_LIBRARY(cpptcl_orxonox SHARED CppTcl.cc)
+ #
+ #             ORXONOX - the hottest 3D action shooter ever to exist
+ #                             > www.orxonox.net <
+ #
+ #        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.
+ #
 
-TARGET_LINK_LIBRARIES(cpptcl_orxonox
-  ${TCL_LIBRARY}
+SET(CPPTCL_FILES
+  cpptcl.h
+  cpptcl.cc
+
+  details/callbacks.h
+  details/callbacks_v.h
+  details/constructors.h
+  details/conversions.h
+  details/dispatchers.h
+  details/metahelpers.h
+  details/methods.h
+  details/methods_v.h
 )
+GENERATE_SOURCE_GROUPS(${CPPTCL_FILES})
+
+IF(MSVC)
+  ADD_LIBRARY(cpptcl_orxonox STATIC ${CPPTCL_FILES})
+ELSE()
+  ADD_LIBRARY(cpptcl_orxonox SHARED ${CPPTCL_FILES})
+  ORXONOX_INSTALL(cpptcl_orxonox)
+ENDIF()
+
+TARGET_LINK_LIBRARIES(cpptcl_orxonox ${TCL_LIBRARY})