diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index 3f1dc485b..06acc5258 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -38,17 +38,17 @@ INCLUDE(${CMAKE_ROOT}/Modules/Documentation.cmake OPTIONAL) CHECK_OUT_OF_SOURCE() IF(WIN32) - SET(CMAKE_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../3rdParty/include;${CMAKE_INCLUDE_PATH}") + SET(CMAKE_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/3rdParty/include;${CMAKE_INCLUDE_PATH}") # Stupid hack for FindOpenAL.cmake - SET(CMAKE_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../3rdParty;${CMAKE_INCLUDE_PATH}") - SET(CMAKE_LIBRARY_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../3rdParty/lib;${CMAKE_LIBRARY_PATH}") + SET(CMAKE_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/3rdParty;${CMAKE_INCLUDE_PATH}") + SET(CMAKE_LIBRARY_PATH "${CMAKE_CURRENT_SOURCE_DIR}/3rdParty/lib;${CMAKE_LIBRARY_PATH}") IF(NOT DEFINED ENV{QTDIR}) SET(ENV{QTDIR} "c:/qt/4.5.0") ENDIF(NOT DEFINED ENV{QTDIR}) ENDIF(WIN32) CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -PROJECT(NeL CXX C) +PROJECT(RyzomCore CXX C) SET(NL_VERSION_MAJOR 0) SET(NL_VERSION_MINOR 7) SET(NL_VERSION_PATCH 0) @@ -63,6 +63,8 @@ SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) # Set default config options # NL_SETUP_DEFAULT_OPTIONS() +NL_SETUP_NEL_DEFAULT_OPTIONS() +NL_SETUP_RYZOM_DEFAULT_OPTIONS() NL_SETUP_PREFIX_PATHS() #----------------------------------------------------------------------------- @@ -80,107 +82,6 @@ FIND_PACKAGE(Jpeg) NL_SETUP_BUILD() -IF(WITH_STATIC_DRIVERS) - IF(WIN32) - ADD_DEFINITIONS(/DNL_STATIC) - ELSE(WIN32) - ADD_DEFINITIONS(-DNL_STATIC) - ENDIF(WIN32) -ENDIF(WITH_STATIC_DRIVERS) - -# On Windows we need to find DirectInput for NLMISC. -# This is how we get events. -IF(WIN32) - FIND_PACKAGE(DirectXSDK) - - # On Win32 we can also build the MAX plugins. - IF(WITH_MAXPLUGIN) - FIND_PACKAGE(3dsMaxSDK) - ENDIF(WITH_MAXPLUGIN) -ENDIF(WIN32) - -IF(WITH_3D) - FIND_PACKAGE(FreeType) - - IF(WITH_DRIVER_OPENGL) - FIND_PACKAGE(OpenGL) - IF(NOT WIN32) - IF(APPLE) - FIND_LIBRARY(CARBON NAMES Carbon) - FIND_LIBRARY(COCOA NAMES Cocoa) - ELSE(APPLE) - FIND_PACKAGE(X11) - FIND_PACKAGE(XF86VidMode) - FIND_PACKAGE(XRandR) - ENDIF(APPLE) - ENDIF(NOT WIN32) - ENDIF(WITH_DRIVER_OPENGL) - - IF(WITH_CEGUI) - FIND_PACKAGE(CEGUI) - ENDIF(WITH_CEGUI) - -ENDIF(WITH_3D) - -IF(WITH_SOUND) - FIND_PACKAGE(Ogg) - FIND_PACKAGE(Vorbis) - - IF(WITH_DRIVER_OPENAL) - FIND_PACKAGE(OpenAL) - ENDIF(WITH_DRIVER_OPENAL) - - IF(WITH_DRIVER_FMOD) - FIND_PACKAGE(FMOD) - ENDIF(WITH_DRIVER_FMOD) -ENDIF(WITH_SOUND) - -IF(WITH_GTK) - FIND_PACKAGE(GTK2) -ENDIF(WITH_GTK) - -IF(WITH_QT) - FIND_PACKAGE(Qt4 REQUIRED) -ENDIF(WITH_QT) - -IF(WITH_TESTS) - FIND_PACKAGE(CppTest) - - - ENABLE_TESTING() - ADD_TEST(nel_unit_test ${EXECUTABLE_OUTPUT_PATH}/nel_unit_test --html) - IF(BUILD_DASHBOARD) - INCLUDE(Dart) - SET(SVNCOMMAND svn) - SET(SVNSOURCEDIR http://dev.ryzom.com/svn/trunk/nel) - SET(GENERATELOGS svn2cl) - ENDIF(BUILD_DASHBOARD) -ENDIF(WITH_TESTS) - -IF(UNIX) - SET(prefix ${CMAKE_INSTALL_PREFIX}) - SET(exec_prefix ${CMAKE_INSTALL_PREFIX}/bin) - SET(libdir "${CMAKE_INSTALL_PREFIX}/lib") - SET(includedir "${CMAKE_INSTALL_PREFIX}/include") - SET(enable_ligo ${WITH_LIGO}) - SET(enable_logic ${WITH_LOGIC}) - SET(enable_georges ${WITH_GEORGES}) - SET(enable_net ${WITH_NET}) - SET(enable_3d ${WITH_3D}) - SET(enable_pacs ${WITH_PACS}) - SET(enable_sound ${WITH_SOUND}) - CONFIGURE_FILE(nel-config.in nel-config) - - INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/nel-config DESTINATION bin) -ENDIF(UNIX) - -IF(WIN32) - INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake) - SET(WINSOCK2_LIB ws2_32.lib) -ENDIF(WIN32) - -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/src) - NL_SETUP_BUILD_FLAGS() INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/PCHSupport.cmake) @@ -189,19 +90,18 @@ IF(FINAL_VERSION) ADD_DEFINITIONS(-DFINAL_VERSION=1) ENDIF(FINAL_VERSION) -ADD_SUBDIRECTORY(src) -ADD_SUBDIRECTORY(include) +IF(WITH_QT) + FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui QtXml REQUIRED) +ENDIF(WITH_QT) -IF(WITH_SAMPLES) - ADD_SUBDIRECTORY(samples) -ENDIF(WITH_SAMPLES) +IF(WITH_NEL) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/nel/include) + ADD_SUBDIRECTORY(nel) +ENDIF(WITH_NEL) -IF(WITH_TOOLS) - IF(WIN32) - FIND_PACKAGE(S3TC) - ENDIF(WIN32) - ADD_SUBDIRECTORY(tools) -ENDIF(WITH_TOOLS) +IF(WITH_RYZOM) + ADD_SUBDIRECTORY(ryzom) +ENDIF(WITH_RYZOM) # To build the documention, you will have to enable it # and then do the equivalent of "make DoxygenDoc". diff --git a/code/CMakeModules/FindLibwww.cmake b/code/CMakeModules/FindLibwww.cmake index 32319fd7d..d715fa139 100644 --- a/code/CMakeModules/FindLibwww.cmake +++ b/code/CMakeModules/FindLibwww.cmake @@ -85,14 +85,9 @@ FIND_WWW_LIBRARY(LIBWWWZIP_LIBRARY wwwzip) # combine all the libraries into one variable SET(LIBWWW_LIBRARY - ${LIBMD5_LIBRARY} ${LIBWWWAPP_LIBRARY} - ${LIBWWWCORE_LIBRARY} ${LIBWWWDIR_LIBRARY} - ${LIBWWWFTP_LIBRARY} ${LIBWWWGOPHER_LIBRARY} ${LIBWWWHTML_LIBRARY} - ${LIBWWWHTTP_LIBRARY} ${LIBWWWINIT_LIBRARY} ${LIBWWWMIME_LIBRARY} - ${LIBWWWMUX_LIBRARY} ${LIBWWWNEWS_LIBRARY} - ${LIBWWWSTREAM_LIBRARY} ${LIBWWWTELNET_LIBRARY} - ${LIBWWWZIP_LIBRARY} ${LIBWWWCACHE_LIBRARY} ${LIBWWWFILE_LIBRARY} - ${LIBWWWTRANS_LIBRARY} ${LIBWWWUTILS_LIBRARY} ${LIBWWWXML_LIBRARY} + ${LIBWWWAPP_LIBRARY} ${LIBWWWCORE_LIBRARY} ${LIBWWWDIR_LIBRARY} ${LIBWWWHTML_LIBRARY} + ${LIBWWWHTTP_LIBRARY} ${LIBWWWINIT_LIBRARY} ${LIBWWWMIME_LIBRARY} ${LIBWWWMUX_LIBRARY} + ${LIBWWWSTREAM_LIBRARY} ${LIBWWWCACHE_LIBRARY} ${LIBWWWFILE_LIBRARY} ${LIBWWWTRANS_LIBRARY} ${LIBWWWUTILS_LIBRARY} ) IF(LIBWWW_LIBRARY AND LIBWWW_INCLUDE_DIR) diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake index 6535e5739..3125ddb78 100644 --- a/code/CMakeModules/nel.cmake +++ b/code/CMakeModules/nel.cmake @@ -165,6 +165,21 @@ MACRO(NL_SETUP_DEFAULT_OPTIONS) ENDIF(WIN32) OPTION(WITH_STATIC_DRIVERS "With static drivers." OFF) + + ### + # Optional support + ### + OPTION(WITH_GTK "With GTK Support" OFF) + OPTION(WITH_QT "With QT Support" OFF) + OPTION(WITH_STLPORT "With STLport support." OFF) + OPTION(BUILD_DASHBOARD "Build to the CDash dashboard" OFF) + + OPTION(WITH_NEL "Build NeL (nearly always required)." ON ) + OPTION(WITH_NELNS "Build NeL Network Services." ON ) + OPTION(WITH_RYZOM "Build Ryzom Core." ON ) +ENDMACRO(NL_SETUP_DEFAULT_OPTIONS) + +MACRO(NL_SETUP_NEL_DEFAULT_OPTIONS) ### # Core libraries ### @@ -189,16 +204,25 @@ MACRO(NL_SETUP_DEFAULT_OPTIONS) ### # Optional support ### - OPTION(WITH_CEGUI "Build CEGUI Renderer" OFF) - OPTION(WITH_TOOLS "Build NeL Tools" ON ) - OPTION(WITH_MAXPLUGIN "Build NeL 3dsMax Plugin" OFF) - OPTION(WITH_SAMPLES "Build NeL Samples" ON ) - OPTION(WITH_TESTS "Build NeL Unit Tests" ON ) - OPTION(WITH_GTK "With GTK Support" OFF) - OPTION(WITH_QT "With QT Support" OFF) - OPTION(WITH_STLPORT "With STLport support." OFF) - OPTION(BUILD_DASHBOARD "Build to the CDash dashboard" OFF) -ENDMACRO(NL_SETUP_DEFAULT_OPTIONS) + OPTION(WITH_NEL_CEGUI "Build CEGUI Renderer" OFF) + OPTION(WITH_NEL_TOOLS "Build NeL Tools" ON ) + OPTION(WITH_NEL_MAXPLUGIN "Build NeL 3dsMax Plugin" OFF) + OPTION(WITH_NEL_SAMPLES "Build NeL Samples" ON ) + OPTION(WITH_NEL_TESTS "Build NeL Unit Tests" ON ) + +ENDMACRO(NL_SETUP_NEL_DEFAULT_OPTIONS) + +MACRO(NL_SETUP_RYZOM_DEFAULT_OPTIONS) + ### + # Core libraries + ### + OPTION(WITH_RYZOM_CLIENT "Build Ryzom Core Client" ON ) + OPTION(WITH_RYZOM_TOOLS "Build Ryzom Core Tools" ON ) + OPTION(WITH_RYZOM_SERVER "Build Ryzom Core Services" ON ) + OPTION(WITH_RYZOM_SOUND "Enable Ryzom Core Sound" ON ) + + OPTION(WITH_LUA51 "Build Ryzom Core using Lua51" ON ) +ENDMACRO(NL_SETUP_RYZOM_DEFAULT_OPTIONS) MACRO(NL_SETUP_BUILD) diff --git a/code/COPYING b/code/COPYING new file mode 100644 index 000000000..dba13ed2d --- /dev/null +++ b/code/COPYING @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 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 Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/code/README b/code/README new file mode 100644 index 000000000..e880666e5 --- /dev/null +++ b/code/README @@ -0,0 +1,32 @@ +Introduction +------------ + +NeL is a software platform for creating and running massively multi-user +entertainment in a 3D environment over the Internet. + +The NeL library is further divided into specific modules: network, ai, 3d +and misc. If you want to use any of these, you also need to use the misc +part of the library, but ai, 3d and network are totally independant from +each other so you can use only the parts you really need in your project. + +If you want know more about the library content and functionalities, you +should take a look on the documents present in the doc directory. + +NeL is currently developped and tested under GNU/Linux and Windows +environments. + + +License +------- + +NeL is a Free Software project under the GNU Affero General Public License, +which means all its code is available for everyone to download, examine, +use, modify, and distribute, subject to the usual restrictions attached +to any GPL software. If you are not familiar with the AGPL, see the COPYING +file for for more details on license terms and other legal issues. + + +Installation +------------ + +Please check the dev.ryzom.com for more information \ No newline at end of file diff --git a/code/nel/CMakeLists.txt b/code/nel/CMakeLists.txt new file mode 100644 index 000000000..7eeb3a8d9 --- /dev/null +++ b/code/nel/CMakeLists.txt @@ -0,0 +1,109 @@ +PROJECT(NeL CXX C) + +IF(WITH_STATIC_DRIVERS) + IF(WIN32) + ADD_DEFINITIONS(/DNL_STATIC) + ELSE(WIN32) + ADD_DEFINITIONS(-DNL_STATIC) + ENDIF(WIN32) +ENDIF(WITH_STATIC_DRIVERS) + +# On Windows we need to find DirectInput for NLMISC. +# This is how we get events. +IF(WIN32) + FIND_PACKAGE(DirectXSDK) + + # On Win32 we can also build the MAX plugins. + IF(WITH_MAXPLUGIN) + FIND_PACKAGE(3dsMaxSDK) + ENDIF(WITH_MAXPLUGIN) +ENDIF(WIN32) + +IF(WITH_3D) + FIND_PACKAGE(FreeType) + + IF(WITH_DRIVER_OPENGL) + FIND_PACKAGE(OpenGL) + IF(NOT WIN32) + IF(APPLE) + FIND_LIBRARY(CARBON NAMES Carbon) + FIND_LIBRARY(COCOA NAMES Cocoa) + ELSE(APPLE) + FIND_PACKAGE(X11) + FIND_PACKAGE(XF86VidMode) + FIND_PACKAGE(XRandR) + ENDIF(APPLE) + ENDIF(NOT WIN32) + ENDIF(WITH_DRIVER_OPENGL) + + IF(WITH_CEGUI) + FIND_PACKAGE(CEGUI) + ENDIF(WITH_CEGUI) + +ENDIF(WITH_3D) + +IF(WITH_SOUND) + FIND_PACKAGE(Ogg) + FIND_PACKAGE(Vorbis) + + IF(WITH_DRIVER_OPENAL) + FIND_PACKAGE(OpenAL) + ENDIF(WITH_DRIVER_OPENAL) + + IF(WITH_DRIVER_FMOD) + FIND_PACKAGE(FMOD) + ENDIF(WITH_DRIVER_FMOD) +ENDIF(WITH_SOUND) + +IF(WITH_GTK) + FIND_PACKAGE(GTK2) +ENDIF(WITH_GTK) + +IF(WITH_NEL_TESTS) + FIND_PACKAGE(CppTest) + + ENABLE_TESTING() + ADD_TEST(nel_unit_test ${EXECUTABLE_OUTPUT_PATH}/nel_unit_test --html) + IF(BUILD_DASHBOARD) + INCLUDE(Dart) + SET(SVNCOMMAND svn) + SET(SVNSOURCEDIR http://dev.ryzom.com/svn/trunk/nel) + SET(GENERATELOGS svn2cl) + ENDIF(BUILD_DASHBOARD) +ENDIF(WITH_NEL_TESTS) + +IF(UNIX) + SET(prefix ${CMAKE_INSTALL_PREFIX}) + SET(exec_prefix ${CMAKE_INSTALL_PREFIX}/bin) + SET(libdir "${CMAKE_INSTALL_PREFIX}/lib") + SET(includedir "${CMAKE_INSTALL_PREFIX}/include") + SET(enable_ligo ${WITH_LIGO}) + SET(enable_logic ${WITH_LOGIC}) + SET(enable_georges ${WITH_GEORGES}) + SET(enable_net ${WITH_NET}) + SET(enable_3d ${WITH_3D}) + SET(enable_pacs ${WITH_PACS}) + SET(enable_sound ${WITH_SOUND}) + CONFIGURE_FILE(nel-config.in nel-config) + + INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/nel-config DESTINATION bin) +ENDIF(UNIX) + +IF(WIN32) + INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake) + SET(WINSOCK2_LIB ws2_32.lib) +ENDIF(WIN32) + +ADD_SUBDIRECTORY(include) +ADD_SUBDIRECTORY(src) + +IF(WITH_NEL_SAMPLES) + ADD_SUBDIRECTORY(samples) +ENDIF(WITH_NEL_SAMPLES) + +IF(WITH_NEL_TOOLS) + IF(WIN32) + FIND_PACKAGE(S3TC) + ENDIF(WIN32) + ADD_SUBDIRECTORY(tools) +ENDIF(WITH_NEL_TOOLS) \ No newline at end of file diff --git a/code/nel/samples/3d/cegui/CMakeLists.txt b/code/nel/samples/3d/cegui/CMakeLists.txt index 6e8a19a3f..ba04f4229 100644 --- a/code/nel/samples/3d/cegui/CMakeLists.txt +++ b/code/nel/samples/3d/cegui/CMakeLists.txt @@ -11,7 +11,7 @@ IF(WIN32) LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" LINK_FLAGS "/SUBSYSTEM:WINDOWS" - PROJECT_LABEL "Samples, 3D: NeL CEGUI Demo") + PROJECT_LABEL "NeL, Samples, 3D: NeL CEGUI Demo") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/3d/cluster_viewer/CMakeLists.txt b/code/nel/samples/3d/cluster_viewer/CMakeLists.txt index 16208dd28..384659264 100644 --- a/code/nel/samples/3d/cluster_viewer/CMakeLists.txt +++ b/code/nel/samples/3d/cluster_viewer/CMakeLists.txt @@ -7,7 +7,7 @@ ADD_DEFINITIONS(-DCV_DIR="\\"${NL_SHARE_PREFIX}/nl_sample_clusterview/\\"") INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_clusterview ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc nel3d) NL_ADD_RUNTIME_FLAGS(nl_sample_clusterview) -NL_DEFAULT_PROPS(nl_sample_clusterview "Samples, 3D: Cluster Viewer") +NL_DEFAULT_PROPS(nl_sample_clusterview "NeL, Samples, 3D: Cluster Viewer") ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/3d/font/CMakeLists.txt b/code/nel/samples/3d/font/CMakeLists.txt index 503fa3e7a..2346ca734 100644 --- a/code/nel/samples/3d/font/CMakeLists.txt +++ b/code/nel/samples/3d/font/CMakeLists.txt @@ -6,7 +6,7 @@ ADD_DEFINITIONS(-DFONT_DIR="\\"${NL_SHARE_PREFIX}/nl_sample_font/\\"") INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_font ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc nel3d) -NL_DEFAULT_PROPS(nl_sample_font "Samples, 3D: Font") +NL_DEFAULT_PROPS(nl_sample_font "NeL, Samples, 3D: Font") NL_ADD_RUNTIME_FLAGS(nl_sample_font) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/3d/shape_viewer/CMakeLists.txt b/code/nel/samples/3d/shape_viewer/CMakeLists.txt index e0544ef1e..91e008cba 100644 --- a/code/nel/samples/3d/shape_viewer/CMakeLists.txt +++ b/code/nel/samples/3d/shape_viewer/CMakeLists.txt @@ -4,7 +4,7 @@ ADD_EXECUTABLE(nl_sample_shapeview WIN32 ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_shapeview ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc nel3d) -NL_DEFAULT_PROPS(nl_sample_shapeview "Samples, 3D: Font") +NL_DEFAULT_PROPS(nl_sample_shapeview "NeL, Samples, 3D: Font") NL_ADD_RUNTIME_FLAGS(nl_sample_shapeview) IF(WIN32) diff --git a/code/nel/samples/georges/CMakeLists.txt b/code/nel/samples/georges/CMakeLists.txt index abbeb60af..1feb7301e 100644 --- a/code/nel/samples/georges/CMakeLists.txt +++ b/code/nel/samples/georges/CMakeLists.txt @@ -6,7 +6,7 @@ ADD_DEFINITIONS(-DGF_DIR="\\"${NL_SHARE_PREFIX}/nl_sample_georges/\\"") INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_georges ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelgeorges nelmisc) -NL_DEFAULT_PROPS(nl_sample_georges "Samples: Georges") +NL_DEFAULT_PROPS(nl_sample_georges "NeL, Samples: Georges") NL_ADD_RUNTIME_FLAGS(nl_sample_georges) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/misc/command/CMakeLists.txt b/code/nel/samples/misc/command/CMakeLists.txt index 8f830d199..cffdbbff7 100644 --- a/code/nel/samples/misc/command/CMakeLists.txt +++ b/code/nel/samples/misc/command/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp) ADD_EXECUTABLE(nl_sample_command ${SRC}) TARGET_LINK_LIBRARIES(nl_sample_command ${PLATFORM_LINKFLAGS} nelmisc) -NL_DEFAULT_PROPS(nl_sample_command "Samples, Misc: Commands") +NL_DEFAULT_PROPS(nl_sample_command "NeL, Samples, Misc: Commands") NL_ADD_RUNTIME_FLAGS(nl_sample_command) INSTALL(TARGETS nl_sample_command RUNTIME DESTINATION bin COMPONENT samplesmisc) diff --git a/code/nel/samples/misc/configfile/CMakeLists.txt b/code/nel/samples/misc/configfile/CMakeLists.txt index b7b0232fa..7924d41a0 100644 --- a/code/nel/samples/misc/configfile/CMakeLists.txt +++ b/code/nel/samples/misc/configfile/CMakeLists.txt @@ -5,7 +5,7 @@ ADD_EXECUTABLE(nl_sample_configfile ${SRC}) ADD_DEFINITIONS(-DNL_SAMPLE_CFG="\\"${NL_SHARE_PREFIX}/nl_sample_configfile/\\"") TARGET_LINK_LIBRARIES(nl_sample_configfile ${PLATFORM_LINKFLAGS} nelmisc) -NL_DEFAULT_PROPS(nl_sample_configfile "Samples, Misc: Config Files") +NL_DEFAULT_PROPS(nl_sample_configfile "NeL, Samples, Misc: Config Files") NL_ADD_RUNTIME_FLAGS(nl_sample_configfile) INSTALL(TARGETS nl_sample_configfile RUNTIME DESTINATION bin COMPONENT samplesmisc) diff --git a/code/nel/samples/misc/debug/CMakeLists.txt b/code/nel/samples/misc/debug/CMakeLists.txt index 4b0569045..843209cd7 100644 --- a/code/nel/samples/misc/debug/CMakeLists.txt +++ b/code/nel/samples/misc/debug/CMakeLists.txt @@ -4,7 +4,7 @@ ADD_EXECUTABLE(nl_sample_debug ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_debug ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc) -NL_DEFAULT_PROPS(nl_sample_debug "Samples, Misc: Debugging") +NL_DEFAULT_PROPS(nl_sample_debug "NeL, Samples, Misc: Debugging") NL_ADD_RUNTIME_FLAGS(nl_sample_debug) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/misc/i18n/CMakeLists.txt b/code/nel/samples/misc/i18n/CMakeLists.txt index 9fc44db13..44059fe3c 100644 --- a/code/nel/samples/misc/i18n/CMakeLists.txt +++ b/code/nel/samples/misc/i18n/CMakeLists.txt @@ -6,7 +6,7 @@ ADD_DEFINITIONS(-DNL_LANG_DATA="\\"${NL_SHARE_PREFIX}/nl_sample_i18n/\\"") INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_i18n ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc) -NL_DEFAULT_PROPS(nl_sample_i18n "Samples, Misc: I18N") +NL_DEFAULT_PROPS(nl_sample_i18n "NeL, Samples, Misc: I18N") NL_ADD_RUNTIME_FLAGS(nl_sample_i18n) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/misc/log/CMakeLists.txt b/code/nel/samples/misc/log/CMakeLists.txt index 7f7085c83..547b2f268 100644 --- a/code/nel/samples/misc/log/CMakeLists.txt +++ b/code/nel/samples/misc/log/CMakeLists.txt @@ -4,7 +4,7 @@ ADD_EXECUTABLE(nl_sample_log ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_log ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc) -NL_DEFAULT_PROPS(nl_sample_log "Samples, Misc: Logging") +NL_DEFAULT_PROPS(nl_sample_log "NeL, Samples, Misc: Logging") NL_ADD_RUNTIME_FLAGS(nl_sample_log) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/misc/strings/CMakeLists.txt b/code/nel/samples/misc/strings/CMakeLists.txt index c0942fc2d..6c2b3295d 100644 --- a/code/nel/samples/misc/strings/CMakeLists.txt +++ b/code/nel/samples/misc/strings/CMakeLists.txt @@ -4,7 +4,7 @@ ADD_EXECUTABLE(nl_sample_strings ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_strings ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc) -NL_DEFAULT_PROPS(nl_sample_strings "Samples, Misc: Strings") +NL_DEFAULT_PROPS(nl_sample_strings "NeL, Samples, Misc: Strings") NL_ADD_RUNTIME_FLAGS(nl_sample_strings) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/net/chat/CMakeLists.txt b/code/nel/samples/net/chat/CMakeLists.txt index b9e79d9d0..c0a5e670a 100644 --- a/code/nel/samples/net/chat/CMakeLists.txt +++ b/code/nel/samples/net/chat/CMakeLists.txt @@ -15,12 +15,12 @@ IF(WIN32) LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" LINK_FLAGS "/SUBSYSTEM:CONSOLE" - PROJECT_LABEL "Samples, Net, Chat: Chat Client") + PROJECT_LABEL "NeL, Samples, Net, Chat: Chat Client") SET_TARGET_PROPERTIES(nl_sample_chatserver PROPERTIES LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" LINK_FLAGS "/SUBSYSTEM:WINDOWS" - PROJECT_LABEL "Samples, Net, Chat: Chat Server") + PROJECT_LABEL "NeL, Samples, Net, Chat: Chat Server") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/net/class_transport/CMakeLists.txt b/code/nel/samples/net/class_transport/CMakeLists.txt index f8f67522e..a8203b411 100644 --- a/code/nel/samples/net/class_transport/CMakeLists.txt +++ b/code/nel/samples/net/class_transport/CMakeLists.txt @@ -12,12 +12,12 @@ IF(WIN32) LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" LINK_FLAGS "/SUBSYSTEM:WINDOWS" - PROJECT_LABEL "Samples, Net, Class Transport: AI Service") + PROJECT_LABEL "NeL, Samples, Net, Class Transport: AI Service") SET_TARGET_PROPERTIES(nl_sample_ct_gd_service PROPERTIES LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" LINK_FLAGS "/SUBSYSTEM:WINDOWS" - PROJECT_LABEL "Samples, Net, Class Transport: GD Service") + PROJECT_LABEL "NeL, Samples, Net, Class Transport: GD Service") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/net/login_system/CMakeLists.txt b/code/nel/samples/net/login_system/CMakeLists.txt index e10000242..e9013bc15 100644 --- a/code/nel/samples/net/login_system/CMakeLists.txt +++ b/code/nel/samples/net/login_system/CMakeLists.txt @@ -11,12 +11,12 @@ IF(WIN32) SET_TARGET_PROPERTIES(nl_sample_ls_client PROPERTIES LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" - PROJECT_LABEL "Samples, Net, Login Service: LS Client") + PROJECT_LABEL "NeL, Samples, Net, Login Service: LS Client") SET_TARGET_PROPERTIES(nl_sample_ls_fes PROPERTIES LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" LINK_FLAGS "/SUBSYSTEM:WINDOWS" - PROJECT_LABEL "Samples, Net, Login Service: LS Frontend") + PROJECT_LABEL "NeL, Samples, Net, Login Service: LS Frontend") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/net/udp/CMakeLists.txt b/code/nel/samples/net/udp/CMakeLists.txt index 8b0511728..f0cb89c6e 100644 --- a/code/nel/samples/net/udp/CMakeLists.txt +++ b/code/nel/samples/net/udp/CMakeLists.txt @@ -13,8 +13,8 @@ ENDIF(WITH_3D) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_udpclient ${PLATFORM_LINKFLAGS} nelmisc nelnet nel3d) TARGET_LINK_LIBRARIES(nl_sample_udpserver ${PLATFORM_LINKFLAGS} nelmisc nelnet) -NL_DEFAULT_PROPS(nl_sample_udpclient "Samples, Net, UDP: UDP Client") -NL_DEFAULT_PROPS(nl_sample_udpserver "Samples, Net, UDP: UDP Server") +NL_DEFAULT_PROPS(nl_sample_udpclient "NeL, Samples, Net, UDP: UDP Client") +NL_DEFAULT_PROPS(nl_sample_udpserver "NeL, Samples, Net, UDP: UDP Server") NL_ADD_RUNTIME_FLAGS(nl_sample_udpclient) NL_ADD_RUNTIME_FLAGS(nl_sample_udpserver) diff --git a/code/nel/tools/3d/tile_edit_qt/CMakeLists.txt b/code/nel/tools/3d/tile_edit_qt/CMakeLists.txt index c7425ebb2..0becf5f5b 100644 --- a/code/nel/tools/3d/tile_edit_qt/CMakeLists.txt +++ b/code/nel/tools/3d/tile_edit_qt/CMakeLists.txt @@ -1,5 +1,5 @@ INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR}/tools/3d/tile_edit_qt/ ) -INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/tools/3d/tile_edit_qt/ ) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) INCLUDE( ${QT_USE_FILE} ) FILE(GLOB TILE_EDIT_SRC *.cpp pic/*.c pic/*.cpp) @@ -7,10 +7,6 @@ SET(TILE_EDIT_HDR items_edit_dlg.h tile_browser_dlg.h tile_edit_dlg.h tile_rotat SET(TILE_EDIT_UIS tile_widget_qt.ui tile_rotation_qt.ui tile_edit_qt.ui tile_browser_qt.ui items_edit_qt.ui) SET(TILE_EDIT_RCS tile_edit_qt.qrc) - -SET( QT_USE_QT3SUPPORT TRUE) -SET( QT_USE_QTXML TRUE) - QT4_ADD_RESOURCES( TILE_EDIT_RC_SRCS ${TILE_EDIT_RCS} ) QT4_WRAP_UI( TILE_EDIT_UI_HDRS ${TILE_EDIT_UIS} ) QT4_WRAP_CPP( TILE_EDIT_MOC_SRCS ${TILE_EDIT_HDR}) diff --git a/code/nel/tools/CMakeLists.txt b/code/nel/tools/CMakeLists.txt index 6385953c0..f32cfaab3 100644 --- a/code/nel/tools/CMakeLists.txt +++ b/code/nel/tools/CMakeLists.txt @@ -1,4 +1,4 @@ -SUBDIRS(misc) +ADD_SUBDIRECTORY(misc) IF(WITH_3D) SUBDIRS(3d) diff --git a/code/nel/tools/misc/CMakeLists.txt b/code/nel/tools/misc/CMakeLists.txt index 33e075c1a..3e4410e86 100644 --- a/code/nel/tools/misc/CMakeLists.txt +++ b/code/nel/tools/misc/CMakeLists.txt @@ -1,4 +1,7 @@ -SUBDIRS(bnp_make disp_sheet_id make_sheet_id xml_packer) +ADD_SUBDIRECTORY(bnp_make) +ADD_SUBDIRECTORY(disp_sheet_id) +ADD_SUBDIRECTORY(make_sheet_id) +ADD_SUBDIRECTORY(xml_packer) IF(WITH_QT) ADD_SUBDIRECTORY(words_dic_qt) diff --git a/code/nel/tools/misc/words_dic_qt/CMakeLists.txt b/code/nel/tools/misc/words_dic_qt/CMakeLists.txt index d2a98f837..b697e9f50 100644 --- a/code/nel/tools/misc/words_dic_qt/CMakeLists.txt +++ b/code/nel/tools/misc/words_dic_qt/CMakeLists.txt @@ -1,5 +1,5 @@ INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR}/tools/misc/words_dic_qt/ ) -INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/tools/misc/words_dic_qt/ ) +INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ) INCLUDE( ${QT_USE_FILE} ) FILE(GLOB WORDS_DIC_SRC *.cpp) diff --git a/code/ryzom/CMakeLists.txt b/code/ryzom/CMakeLists.txt index 9cf6558d6..dc89aa7c6 100644 --- a/code/ryzom/CMakeLists.txt +++ b/code/ryzom/CMakeLists.txt @@ -1,82 +1,6 @@ -#----------------------------------------------------------------------------- -# -# Ryzom -# Author: Spiderweb -# -# Notes: -# * Changing install location: add -DCMAKE_INSTALL_PREFIX:PATH=/my/new/path -# * Changing NeL prefix: add -DNEL_PREFIX_PATH:PATH=/my/nel/install -# -#----------------------------------------------------------------------------- - -#----------------------------------------------------------------------------- -# Load some macros. -SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules;${CMAKE_MODULE_PATH}") -INCLUDE(CMakeModules/nel.cmake) -INCLUDE(CMakeModules/ConfigureChecks.cmake) - -#----------------------------------------------------------------------------- -# Force out of source builds. -CHECK_OUT_OF_SOURCE() - -IF(WIN32) - SET(CMAKE_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../3rdParty/include;${CMAKE_INCLUDE_PATH}") - SET(CMAKE_LIBRARY_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../3rdParty/lib;${CMAKE_LIBRARY_PATH}") -ENDIF(WIN32) - -IF(NOT NL_USING_MASTER_PROJECT) - IF(DEFINED NEL_PREFIX_PATH) - SET(CMAKE_INCLUDE_PATH "${NEL_PREFIX_PATH}/include;${CMAKE_INCLUDE_PATH}") - SET(CMAKE_LIBRARY_PATH "${NEL_PREFIX_PATH}/lib;${CMAKE_LIBRARY_PATH}") - ELSE(DEFINED NEL_PREFIX_PATH) - SET(NEL_PREFIX_PATH "" CACHE FILEPATH "NeL Installation Location") - ENDIF(DEFINED NEL_PREFIX_PATH) -ELSE(NOT NL_USING_MASTER_PROJECT) - SET(CMAKE_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/nel/include;${CMAKE_INCLUDE_PATH}") - SET(CMAKE_LIBRARY_PATH "${CMAKE_BINARY_DIR}/lib;${CMAKE_LIBRARY_PATH}") -ENDIF(NOT NL_USING_MASTER_PROJECT) - -CMAKE_MINIMUM_REQUIRED(VERSION 2.6) - -PROJECT(Ryzom CXX C) -SET(NL_VERSION_MAJOR 0) -SET(NL_VERSION_MINOR 7) -SET(NL_VERSION_PATCH 0) -SET(NL_VERSION "${NL_VERSION_MAJOR}.${NL_VERSION_MINOR}.${NL_VERSION_PATCH}") - -#----------------------------------------------------------------------------- -# Redirect output files -SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin) -SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) - -#----------------------------------------------------------------------------- -# Set CMake 2.6 Policies. -IF(COMMAND cmake_policy) - # Works around warnings libraries linked against that don't - # have absolute paths (e.g. -lpthreads) - cmake_policy(SET CMP0003 NEW) - - # Works around warnings about escaped quotes in ADD_DEFINITIONS - # statements - cmake_policy(SET CMP0005 OLD) -ENDIF(COMMAND cmake_policy) - -#----------------------------------------------------------------------------- -# Set default config options - -NL_SETUP_DEFAULT_OPTIONS() -RYZOM_SETUP_PREFIX_PATHS() - -#----------------------------------------------------------------------------- -# Override default options -#SET(WITH_COVERAGE ON ) -SET(WITH_3D ON ) - #----------------------------------------------------------------------------- #Platform specifics -FIND_PACKAGE(Threads REQUIRED) -FIND_PACKAGE(LibXml2 REQUIRED) IF(WITH_LUA51) FIND_PACKAGE(Lua51 REQUIRED) ELSE(WITH_LUA51) @@ -89,45 +13,25 @@ IF(NOT WIN32 AND NOT APPLE) FIND_PACKAGE(X11) ENDIF(NOT WIN32 AND NOT APPLE) -NL_SETUP_BUILD() - -NL_CONFIGURE_CHECKS() - -FIND_PACKAGE(NeL COMPONENTS nelmisc nelnet nel3d nelgeorges nelligo nelpacs nelsound nelsnd_lowlevel REQUIRED) - - -IF(WIN32) - INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake) - SET(WINSOCK2_LIB ws2_32.lib) -ENDIF(WIN32) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common/src ) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common ) -NL_SETUP_BUILD_FLAGS() - -INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/PCHSupport.cmake) - -IF(FINAL_VERSION) - ADD_DEFINITIONS(-DFINAL_VERSION=1) -ENDIF(FINAL_VERSION) - # config.h configuration and use by projects -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h) -INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}) +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) ADD_DEFINITIONS(-DHAVE_CONFIG_H) ADD_SUBDIRECTORY(common) -IF(WITH_CLIENT) +IF(WITH_RYZOM_CLIENT) ADD_SUBDIRECTORY(client) -ENDIF(WITH_CLIENT) +ENDIF(WITH_RYZOM_CLIENT) -IF(WITH_TOOLS) +IF(WITH_RYZOM_TOOLS) ADD_SUBDIRECTORY(tools) -ENDIF(WITH_TOOLS) +ENDIF(WITH_RYZOM_TOOLS) -IF(WITH_SERVER) +IF(WITH_RYZOM_SERVER) FIND_PACKAGE(MySQL REQUIRED) ADD_SUBDIRECTORY(server) -ENDIF(WITH_SERVER) +ENDIF(WITH_RYZOM_SERVER) diff --git a/code/ryzom/client/CMakeLists.txt b/code/ryzom/client/CMakeLists.txt index 14475021e..466291933 100644 --- a/code/ryzom/client/CMakeLists.txt +++ b/code/ryzom/client/CMakeLists.txt @@ -8,7 +8,7 @@ ENDIF(UNIX AND NOT APPLE) IF(RYZOM_SHARE_PREFIX) CONFIGURE_FILE(client_default.cfg.in "${CMAKE_CURRENT_BINARY_DIR}/client_default.cfg") - INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/client_default.cfg" DESTINATION ${RYZOM_ETC_PREFIX}) + INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/client_default.cfg" DESTINATION etc/ryzom) ELSE(RYZOM_SHARE_PREFIX) - INSTALL(FILES client_default.cfg DESTINATION ${RYZOM_ETC_PREFIX}) + INSTALL(FILES client_default.cfg DESTINATION etc/ryzom) ENDIF(RYZOM_SHARE_PREFIX) diff --git a/code/ryzom/client/src/CMakeLists.txt b/code/ryzom/client/src/CMakeLists.txt index 5728d34c0..76f89b494 100644 --- a/code/ryzom/client/src/CMakeLists.txt +++ b/code/ryzom/client/src/CMakeLists.txt @@ -1,6 +1,6 @@ # These are Windows/MFC apps IF(WIN32) - ADD_SUBDIRECTORY(bug_report) +# ADD_SUBDIRECTORY(bug_report) SET(SEVENZIP_LIBRARY "ryzom_sevenzip") ENDIF(WIN32) @@ -29,9 +29,9 @@ LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/interface_v3/view_bitmap_progress.h) # On Unix we'll need to include config.h -IF(UNIX) - INCLUDE(${CMAKE_BINARY_DIR}) -ENDIF(UNIX) +#IF(UNIX) +# INCLUDE(${CMAKE_BINARY_DIR}) +#ENDIF(UNIX) # on Mac, create a .App Bundle if(APPLE) @@ -64,28 +64,27 @@ ENDIF(APPLE) INCLUDE_DIRECTORIES( ${LIBXML2_INCLUDE_DIR} - ${NEL_INCLUDE_DIR} ${LUA_INCLUDE_DIR} ${LIBWWW_INCLUDE_DIR} ${CURL_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}) TARGET_LINK_LIBRARIES(ryzom_client ${PLATFORM_LINKFLAGS} - ${LIBXML2_LIBRARIES} - ${NELMISC_LIBRARY} + nelmisc + nelnet + nelligo + nelgeorges + nel3d + nelsound + nelsnd_lowlevel + ryzom_clientsheets ryzom_gameshare - ${NELNET_LIBRARY} - ${NELLIGO_LIBRARY} - ${NELGEORGES_LIBRARY} - ${NEL3D_LIBRARY} + nelpacs ${LUA_LIBRARIES} ${CURL_LIBRARIES} - ${NELSOUND_LIBRARY} - ${NELSNDDRV_LIBRARY} - ryzom_clientsheets - ${NELPACS_LIBRARY} ${LIBWWW_LIBRARY} ${SEVENZIP_LIBRARY} + ${LIBXML2_LIBRARIES} luabind # TODO: find luabind and expat cleanly using a find script expat) @@ -95,8 +94,11 @@ ENDIF(NOT APPLE AND NOT WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) +NL_DEFAULT_PROPS(ryzom_client "Ryzom, Client: Ryzom Core Client") +NL_ADD_RUNTIME_FLAGS(ryzom_client) + IF(WITH_PCH) ADD_NATIVE_PRECOMPILED_HEADER(ryzom_client ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp) ENDIF(WITH_PCH) -INSTALL(TARGETS ryzom_client RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT client BUNDLE DESTINATION /Applications) +INSTALL(TARGETS ryzom_client RUNTIME DESTINATION games COMPONENT client BUNDLE DESTINATION /Applications) diff --git a/code/ryzom/client/src/client_sheets/CMakeLists.txt b/code/ryzom/client/src/client_sheets/CMakeLists.txt index 52648361b..cc02e3c64 100644 --- a/code/ryzom/client/src/client_sheets/CMakeLists.txt +++ b/code/ryzom/client/src/client_sheets/CMakeLists.txt @@ -3,26 +3,11 @@ FILE(GLOB PRIV_H *.h) SOURCE_GROUP(headers FILES ${PRIV_H} ${PUB_H}) +NL_TARGET_LIB(ryzom_clientsheets ${SRC} ${PRIV_H}) -IF(NOT WIN32) - ADD_LIBRARY(ryzom_clientsheets SHARED ${SRC}) -ELSE(NOT WIN32) - ADD_LIBRARY(ryzom_clientsheets STATIC ${SRC}) -ENDIF(NOT WIN32) - -INCLUDE_DIRECTORIES(${NEL_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(ryzom_clientsheets ryzom_gameshare ${NELMISC_LIBRARY}) -SET_TARGET_PROPERTIES(ryzom_clientsheets PROPERTIES - VERSION ${NL_VERSION} - SOVERSION ${NL_VERSION_MAJOR}) - -IF(WIN32) - SET_TARGET_PROPERTIES(ryzom_clientsheets - PROJECT_LABEL "Library: Client Sheets" - DEBUG_POSTFIX "_d" - RELEASE_POSTFIX "_r" - LINK_FLAGS_DEBUG "/NODEFAULTLIB:msvcrt") -ENDIF(WIN32) +TARGET_LINK_LIBRARIES(ryzom_clientsheets ryzom_gameshare nelmisc) +NL_DEFAULT_PROPS(ryzom_clientsheets "Ryzom, Library: Client Sheets") +NL_ADD_LIB_SUFFIX(ryzom_clientsheets) IF(WITH_PCH) ADD_NATIVE_PRECOMPILED_HEADER(ryzom_clientsheets ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp) diff --git a/code/ryzom/client/src/seven_zip/CMakeLists.txt b/code/ryzom/client/src/seven_zip/CMakeLists.txt index a1c6261fe..4c2d97307 100644 --- a/code/ryzom/client/src/seven_zip/CMakeLists.txt +++ b/code/ryzom/client/src/seven_zip/CMakeLists.txt @@ -9,24 +9,11 @@ ADD_EXECUTABLE(7zDec ${SRC}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) TARGET_LINK_LIBRARIES(7zDec ${PLATFORM_LINKFLAGS}) -IF(NOT WIN32) - ADD_LIBRARY(ryzom_sevenzip SHARED ${LIB_SRC}) -ELSE(NOT WIN32) - ADD_LIBRARY(ryzom_sevenzip STATIC ${LIB_SRC}) -ENDIF(NOT WIN32) +NL_TARGET_LIB(ryzom_sevenzip ${LIB_SRC}) TARGET_LINK_LIBRARIES(ryzom_sevenzip ${PLATFORM_LINKFLAGS}) -SET_TARGET_PROPERTIES(ryzom_sevenzip PROPERTIES - VERSION ${NL_VERSION} - SOVERSION ${NL_VERSION_MAJOR}) - -IF(WIN32) - SET_TARGET_PROPERTIES(ryzom_sevenzip - PROJECT_LABEL "Library: Seven Zip" - DEBUG_POSTFIX "_d" - RELEASE_POSTFIX "_r" - LINK_FLAGS_DEBUG "/NODEFAULTLIB:msvcrt") -ENDIF(WIN32) +NL_DEFAULT_PROPS(ryzom_sevenzip "Ryzom, Library: Seven Zip") +NL_ADD_LIB_SUFFIX(ryzom_sevenzip) ADD_DEFINITIONS(-D_SZ_ONE_DIRECTORY) diff --git a/code/ryzom/common/src/game_share/CMakeLists.txt b/code/ryzom/common/src/game_share/CMakeLists.txt index 7c0f768ca..c55a8e1f9 100644 --- a/code/ryzom/common/src/game_share/CMakeLists.txt +++ b/code/ryzom/common/src/game_share/CMakeLists.txt @@ -7,27 +7,12 @@ SOURCE_GROUP(headers FILES ${PRIV_H} ${PUB_H}) LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.cpp) LIST(REMOVE_ITEM PRIV_H ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.h) -IF(WIN32) - ADD_LIBRARY(ryzom_gameshare STATIC ${SRC}) -ELSE(WIN32) - ADD_LIBRARY(ryzom_gameshare SHARED ${SRC}) -ENDIF(WIN32) +NL_TARGET_LIB(ryzom_gameshare ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) -TARGET_LINK_LIBRARIES(ryzom_gameshare - ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY} - ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES}) -SET_TARGET_PROPERTIES(ryzom_gameshare PROPERTIES - VERSION ${NL_VERSION} - SOVERSION ${NL_VERSION_MAJOR}) - -IF(WIN32) - SET_TARGET_PROPERTIES(ryzom_gameshare - PROJECT_LABEL "Library: Game Share" - DEBUG_POSTFIX "_d" - RELEASE_POSTFIX "_r" - LINK_FLAGS_DEBUG "/NODEFAULTLIB:msvcrt") -ENDIF(WIN32) +TARGET_LINK_LIBRARIES(ryzom_gameshare nelmisc nelnet nelligo nelgeorges ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES}) +NL_DEFAULT_PROPS(ryzom_gameshare "Ryzom, Library: Game Share") +NL_ADD_LIB_SUFFIX(ryzom_gameshare) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/ryzom/server/src/admin_modules/CMakeLists.txt b/code/ryzom/server/src/admin_modules/CMakeLists.txt index 87056bd6d..25ee5ede3 100644 --- a/code/ryzom/server/src/admin_modules/CMakeLists.txt +++ b/code/ryzom/server/src/admin_modules/CMakeLists.txt @@ -2,18 +2,12 @@ FILE(GLOB SRC *.cpp *.h) ADD_LIBRARY(admin_modules STATIC ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) -TARGET_LINK_LIBRARIES(admin_modules ${NELMISC_LIBRARY}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) +TARGET_LINK_LIBRARIES(admin_modules nelmisc) SET_TARGET_PROPERTIES(admin_modules PROPERTIES VERSION ${NL_VERSION}) -IF(WIN32) - SET_TARGET_PROPERTIES(admin_modules - PROJECT_LABEL "Library: Admin Modules" - DEBUG_POSTFIX "_d" - RELEASE_POSTFIX "_r" - LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt" - LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd") -ENDIF(WIN32) +NL_DEFAULT_PROPS(admin_modules "Ryzom, Library: Service Admin Modules") +NL_ADD_LIB_SUFFIX(admin_modules) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/ryzom/server/src/ai_share/CMakeLists.txt b/code/ryzom/server/src/ai_share/CMakeLists.txt index e9b043a07..28c8eba95 100644 --- a/code/ryzom/server/src/ai_share/CMakeLists.txt +++ b/code/ryzom/server/src/ai_share/CMakeLists.txt @@ -2,23 +2,11 @@ FILE(GLOB SRC *.cpp *.h) ADD_LIBRARY(ai_share STATIC ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(ai_share ryzom_gameshare - server_share - ${NELMISC_LIBRARY} - ${NELNET_LIBRARY} - ${NELGEORGES_LIBRARY} - ${NELPACS_LIBRARY}) -SET_TARGET_PROPERTIES(ai_share PROPERTIES VERSION ${NL_VERSION}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(ai_share ryzom_gameshare server_share nelmisc nelnet nelgeorges nelpacs) -IF(WIN32) - SET_TARGET_PROPERTIES(ai_share - PROJECT_LABEL "Library: AI Share" - DEBUG_POSTFIX "_d" - RELEASE_POSTFIX "_r" - LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt" - LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd") -ENDIF(WIN32) +NL_DEFAULT_PROPS(ai_share "Ryzom, Library: AI Shared") +NL_ADD_LIB_SUFFIX(ai_share) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/ryzom/server/src/gameplay_module_lib/CMakeLists.txt b/code/ryzom/server/src/gameplay_module_lib/CMakeLists.txt index dd4824b2d..ef1a89ea7 100644 --- a/code/ryzom/server/src/gameplay_module_lib/CMakeLists.txt +++ b/code/ryzom/server/src/gameplay_module_lib/CMakeLists.txt @@ -1,25 +1,12 @@ FILE(GLOB SRC *.cpp *.h) -IF(WIN32) - ADD_LIBRARY(gameplay_module_lib STATIC ${SRC}) -ELSE(WIN32) - ADD_LIBRARY(gameplay_module_lib SHARED ${SRC}) -ENDIF(WIN32) +NL_TARGET_LIB(gameplay_module_lib ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(gameplay_module_lib ${NELMISC_LIBRARY}) -SET_TARGET_PROPERTIES(gameplay_module_lib PROPERTIES - VERSION ${NL_VERSION} - SOVERSION ${NL_VERSION_MAJOR}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(gameplay_module_lib nelmisc) -IF(WIN32) - SET_TARGET_PROPERTIES(gameplay_module_lib - PROJECT_LABEL "Library: Gameplay Module" - DEBUG_POSTFIX "_d" - RELEASE_POSTFIX "_r" - LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt" - LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd") -ENDIF(WIN32) +NL_DEFAULT_PROPS(gameplay_module_lib "Ryzom, Library: Gameplay Module") +NL_ADD_LIB_SUFFIX(gameplay_module_lib) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/ryzom/server/src/pd_lib/CMakeLists.txt b/code/ryzom/server/src/pd_lib/CMakeLists.txt index 5269c047a..8afe31c4c 100644 --- a/code/ryzom/server/src/pd_lib/CMakeLists.txt +++ b/code/ryzom/server/src/pd_lib/CMakeLists.txt @@ -4,26 +4,13 @@ FILE(GLOB SRC *.cpp *.h) LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/pd_string_manager.cpp ${CMAKE_CURRENT_SOURCE_DIR}/pd_string_manager.h) -IF(WIN32) - ADD_LIBRARY(pd_lib STATIC ${SRC}) -ELSE(WIN32) - ADD_LIBRARY(pd_lib SHARED ${SRC}) -ENDIF(WIN32) +NL_TARGET_LIB(pd_lib ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(pd_lib ${NELMISC_LIBRARY}) -SET_TARGET_PROPERTIES(pd_lib PROPERTIES - VERSION ${NL_VERSION} - SOVERSION ${NL_VERSION_MAJOR}) - -IF(WIN32) - SET_TARGET_PROPERTIES(pd_lib - PROJECT_LABEL "Library: PD Lib" - DEBUG_POSTFIX "_d" - RELEASE_POSTFIX "_r" - LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt" - LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd") -ENDIF(WIN32) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(pd_lib nelmisc) + +NL_DEFAULT_PROPS(pd_lib "Ryzom, Library: PD Lib") +NL_ADD_LIB_SUFFIX(pd_lib) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/ryzom/server/src/pd_reference_builder/CMakeLists.txt b/code/ryzom/server/src/pd_reference_builder/CMakeLists.txt index b8a2c3e81..eb27698c5 100644 --- a/code/ryzom/server/src/pd_reference_builder/CMakeLists.txt +++ b/code/ryzom/server/src/pd_reference_builder/CMakeLists.txt @@ -2,19 +2,21 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(reference_builder_service ${SRC}) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(reference_builder_service ryzom_gameshare +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ryzom/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(reference_builder_service + ryzom_gameshare pd_lib + nelmisc + nelnet + nelgeorges ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} - ${NELMISC_LIBRARY} - ${NELNET_LIBRARY} - ${NELGEORGES_LIBRARY}) -IF(WIN32) - SET_TARGET_PROPERTIES(pd_reference_builder PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" - PROJECT_LABEL "Services: Reference Builder Service (RBS)") -ENDIF(WIN32) + ) + + +NL_DEFAULT_PROPS(reference_builder_service "Ryzom, Services: Reference Builder Service (RBS)") +NL_ADD_RUNTIME_FLAGS(reference_builder_service) + ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) INSTALL(TARGETS reference_builder_service RUNTIME DESTINATION sbin COMPONENT services) diff --git a/code/ryzom/server/src/server_share/CMakeLists.txt b/code/ryzom/server/src/server_share/CMakeLists.txt index b5009204d..574e2ae91 100644 --- a/code/ryzom/server/src/server_share/CMakeLists.txt +++ b/code/ryzom/server/src/server_share/CMakeLists.txt @@ -2,23 +2,11 @@ FILE(GLOB SRC *.cpp *.h) ADD_LIBRARY(server_share STATIC ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(server_share ${NELMISC_LIBRARY} - ${NELPACS_LIBRARY} - ${MYSQL_LIBRARIES} - ${ZLIB_LIBRARIES}) -SET_TARGET_PROPERTIES(server_share PROPERTIES - VERSION ${NL_VERSION} - SOVERSION ${NL_VERSION_MAJOR}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(server_share nelmisc nelpacs ${NELPACS_LIBRARY} ${MYSQL_LIBRARIES} ${ZLIB_LIBRARIES}) -IF(WIN32) - SET_TARGET_PROPERTIES(server_share - PROJECT_LABEL "Library: Server Share" - DEBUG_POSTFIX "_d" - RELEASE_POSTFIX "_r" - LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt" - LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd") -ENDIF(WIN32) +NL_DEFAULT_PROPS(server_share "Ryzom, Library: Service Shared") +NL_ADD_LIB_SUFFIX(server_share) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/ryzom/tools/client/client_patcher/CMakeLists.txt b/code/ryzom/tools/client/client_patcher/CMakeLists.txt index 29ce59b88..fbb394d36 100644 --- a/code/ryzom/tools/client/client_patcher/CMakeLists.txt +++ b/code/ryzom/tools/client/client_patcher/CMakeLists.txt @@ -11,23 +11,25 @@ ADD_EXECUTABLE(ryzom_client_patcher ${SRC}) INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${LIBXML2_INCLUDE_DIR} - ${NEL_INCLUDE_DIR} ${CURL_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/client/src + ${CMAKE_SOURCE_DIR}/ryzom/client/src ) TARGET_LINK_LIBRARIES(ryzom_client_patcher ${PLATFORM_LINKFLAGS} - ${NELMISC_LIBRARY} + nelmisc + nelnet ryzom_gameshare - ${NELNET_LIBRARY} ${CURL_LIBRARIES} ${SEVENZIP_LIBRARY}) ADD_DEFINITIONS(-DRZ_NO_CLIENT -DNL_USE_SEVENZIP) +NL_DEFAULT_PROPS(ryzom_client "Ryzom, Tools: Ryzom Client Patcher") +NL_ADD_RUNTIME_FLAGS(ryzom_client) + IF(WITH_PCH) ADD_NATIVE_PRECOMPILED_HEADER(ryzom_client_patcher ${CMAKE_SOURCE_DIR}/client/src/stdpch.h ${CMAKE_SOURCE_DIR}/client/src/stdpch.cpp) ENDIF(WITH_PCH) -INSTALL(TARGETS ryzom_client_patcher RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT client BUNDLE DESTINATION /Applications) +INSTALL(TARGETS ryzom_client_patcher RUNTIME DESTINATION games COMPONENT client BUNDLE DESTINATION /Applications) diff --git a/code/ryzom/tools/sheets_packer/CMakeLists.txt b/code/ryzom/tools/sheets_packer/CMakeLists.txt index abc3189da..ec520d869 100644 --- a/code/ryzom/tools/sheets_packer/CMakeLists.txt +++ b/code/ryzom/tools/sheets_packer/CMakeLists.txt @@ -1,24 +1,26 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(sheets_packer ${SRC} - ${CMAKE_SOURCE_DIR}/client/src/continent_manager_build.cpp - ${CMAKE_SOURCE_DIR}/client/src/continent_manager_build.h - ${CMAKE_SOURCE_DIR}/client/src/sheet_manager.cpp - ${CMAKE_SOURCE_DIR}/client/src/sheet_manager.h) + ${CMAKE_SOURCE_DIR}/ryzom/client/src/continent_manager_build.cpp + ${CMAKE_SOURCE_DIR}/ryzom/client/src/continent_manager_build.h + ${CMAKE_SOURCE_DIR}/ryzom/client/src/sheet_manager.cpp + ${CMAKE_SOURCE_DIR}/ryzom/client/src/sheet_manager.h) -INCLUDE_DIRECTORIES( ${LIBXML2_INCLUDE_DIR} - ${NEL_INCLUDE_DIR} - ${CMAKE_SOURCE_DIR}/client/src) -TARGET_LINK_LIBRARIES(sheets_packer ryzom_clientsheets +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/client/src) +TARGET_LINK_LIBRARIES(sheets_packer + ryzom_clientsheets ryzom_gameshare - ${NELMISC_LIBRARY} - ${NELGEORGES_LIBRARY} - ${NELNET_LIBRARY} - ${NELLIGO_LIBRARY} + nelmisc + nelgeorges + nelnet + nelligo ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) +NL_DEFAULT_PROPS(sheets_packer "Ryzom, Tools: Sheets Packer") +NL_ADD_RUNTIME_FLAGS(sheets_packer) + IF(WITH_PCH) ADD_NATIVE_PRECOMPILED_HEADER(sheets_packer ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp) ENDIF(WITH_PCH)