Skip to content

Commit

Permalink
Rename to L2PackageTools and add license info.
Browse files Browse the repository at this point in the history
  • Loading branch information
Bigcheese committed Aug 27, 2011
1 parent ef7eef9 commit a7cd7ff
Show file tree
Hide file tree
Showing 21 changed files with 151 additions and 99 deletions.
53 changes: 24 additions & 29 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
#-----------------------------------------------------------------------------
#Filename: CMakeLists.txt
#-----------------------------------------------------------------------------
#===- CMakeLists.txt --------------------------------------------------------===
#
#This source file is part of the
# ___ __ __ _ _ _
# /___\__ _ _ __ ___ / / /\ \ (_) | _(_)
# // // _` | '__/ _ \ \ \/ \/ / | |/ / |
#/ \_// (_| | | | __/ \ /\ /| | <| |
#\___/ \__, |_| \___| \/ \/ |_|_|\_\_|
# |___/
# Tutorial Framework
# http://www.ogre3d.org/tikiwiki/
#-----------------------------------------------------------------------------
cmake_minimum_required(VERSION 2.6)

project(OgreApp)
# L2PackageTools
#
# This file is distributed under the Simplified BSD License. See LICENSE.TXT
# for details.
#
#===-------------------------------------------------------------------------===
#
# This is the make CMake file for L2PackageTools
#
#===-------------------------------------------------------------------------===

cmake_minimum_required(VERSION 2.8)

project(L2PackageTools)

if(WIN32)
set(CMAKE_MODULE_PATH "$ENV{OGRE_HOME}/CMake/;${CMAKE_MODULE_PATH}")
Expand Down Expand Up @@ -51,10 +50,6 @@ set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/dist")

find_package(OGRE REQUIRED)

#if(NOT "${OGRE_VERSION_NAME}" STREQUAL "Cthugha")
# message(SEND_ERROR "You need Ogre 1.7 Cthugha to build this.")
#endif()

find_package(OIS REQUIRED)

if(NOT OIS_FOUND)
Expand Down Expand Up @@ -113,20 +108,20 @@ include_directories( ${OIS_INCLUDE_DIRS}
${OGRE_SAMPLES_INCLUDEPATH}
)

add_executable(OgreApp WIN32 ${HDRS} ${SRCS})
add_executable(L2MapViewer WIN32 ${HDRS} ${SRCS})

set_target_properties(OgreApp PROPERTIES DEBUG_POSTFIX _d)
set_target_properties(L2MapViewer PROPERTIES DEBUG_POSTFIX _d)

target_link_libraries(OgreApp ${OGRE_LIBRARIES} ${OIS_LIBRARIES} l2p)
target_link_libraries(L2MapViewer ${OGRE_LIBRARIES} ${OIS_LIBRARIES} l2p)

file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dist/bin)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dist/media)

# post-build copy for win32
if(WIN32 AND NOT MINGW)
add_custom_command( TARGET OgreApp PRE_BUILD
add_custom_command( TARGET L2MapViewer PRE_BUILD
COMMAND if not exist .\\dist\\bin mkdir .\\dist\\bin )
add_custom_command( TARGET OgreApp POST_BUILD
add_custom_command( TARGET L2MapViewer POST_BUILD
COMMAND copy \"$(TargetPath)\" .\\dist\\bin )
endif(WIN32 AND NOT MINGW)

Expand All @@ -136,7 +131,7 @@ endif(MINGW OR UNIX)

if(WIN32)

install(TARGETS OgreApp
install(TARGETS L2MapViewer
RUNTIME DESTINATION bin
CONFIGURATIONS All)

Expand All @@ -162,15 +157,15 @@ if(WIN32)
install(FILES ${OGRE_PLUGIN_DIR_REL}/OgreMain.dll
${OGRE_PLUGIN_DIR_REL}/RenderSystem_Direct3D9.dll
${OGRE_PLUGIN_DIR_REL}/RenderSystem_GL.dll
${OGRE_PLUGIN_DIR_REL}/libOIS.dll
${OGRE_PLUGIN_DIR_REL}/OIS.dll
DESTINATION bin
CONFIGURATIONS Release RelWithDebInfo
)

install(FILES ${OGRE_PLUGIN_DIR_DBG}/OgreMain_d.dll
${OGRE_PLUGIN_DIR_DBG}/RenderSystem_Direct3D9_d.dll
${OGRE_PLUGIN_DIR_DBG}/RenderSystem_GL_d.dll
${OGRE_PLUGIN_DIR_DBG}/libOIS_d.dll
${OGRE_PLUGIN_DIR_DBG}/OIS_d.dll
DESTINATION bin
CONFIGURATIONS Debug
)
Expand All @@ -192,7 +187,7 @@ endif(WIN32)

if(UNIX)

install(TARGETS OgreApp
install(TARGETS L2MapViewer
RUNTIME DESTINATION bin
CONFIGURATIONS All)

Expand Down
30 changes: 30 additions & 0 deletions LICENSE.TXT
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
Copyright 2011 Michael Spencer. All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
OF SUCH DAMAGE.

================================================================================
Copyrights and Licenses for Third Party Software.
================================================================================
L2PackageTools contains code from the following projects/people. All files state
the licence which they are under at the top.

* LLVM - See LLVM_LICENSE.TXT
69 changes: 69 additions & 0 deletions LLVM_LICENSE.TXT
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
==============================================================================
LLVM Release License
==============================================================================
University of Illinois/NCSA
Open Source License

Copyright (c) 2003-2011 University of Illinois at Urbana-Champaign.
All rights reserved.

Developed by:

LLVM Team

University of Illinois at Urbana-Champaign

http://llvm.org

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal with
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:

* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimers.

* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimers in the
documentation and/or other materials provided with the distribution.

* Neither the names of the LLVM Team, University of Illinois at
Urbana-Champaign, nor the names of its contributors may be used to
endorse or promote products derived from this Software without specific
prior written permission.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
SOFTWARE.

==============================================================================
Copyrights and Licenses for Third Party Software Distributed with LLVM:
==============================================================================
The LLVM software contains code written by third parties. Such software will
have its own individual LICENSE.TXT file in the directory in which it appears.
This file will describe the copyrights, license, and restrictions which apply
to that code.

The disclaimer of warranty in the University of Illinois Open Source License
applies to all code in the LLVM Distribution, and nothing in any of the
other licenses gives permission to use the names of the LLVM Team or the
University of Illinois to endorse or promote products derived from this
Software.

The following pieces of software have additional or alternate copyrights,
licenses, and/or restrictions:

Program Directory
------- ---------
Autoconf llvm/autoconf
llvm/projects/ModuleMaker/autoconf
llvm/projects/sample/autoconf
CellSPU backend llvm/lib/Target/CellSPU/README.txt
Google Test llvm/utils/unittest/googletest
OpenBSD regex llvm/lib/Support/{reg*, COPYRIGHT.regex}
Empty file removed README
Empty file.
6 changes: 6 additions & 0 deletions README.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
This is a hacked together program to view (and soon generate geodata from)
Lineage II client maps.

To build you first need to setup Ogre and the tutorial build system:
Build Ogre from source (I use CMake): http://www.ogre3d.org/tikiwiki/Prerequisites
Look here for help with linking OIS properly: http://www.ogre3d.org/tikiwiki/Building+Your+Projects+With+CMake
66 changes: 0 additions & 66 deletions dist/media/materials/scripts/Ogre.material

This file was deleted.

Binary file removed dist/media/materials/textures/GreenSkin.jpg
Binary file not shown.
Binary file removed dist/media/materials/textures/spheremap.png
Binary file not shown.
Binary file removed dist/media/materials/textures/tusk.jpg
Binary file not shown.
Binary file removed dist/media/models/ogrehead.mesh
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
9 changes: 9 additions & 0 deletions l2p/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
#===- l2p/CMakeLists.txt ----------------------------------------------------===
#
# L2PackageTools
#
# This file is distributed under the Simplified BSD License. See LICENSE.TXT
# for details.
#
#===-------------------------------------------------------------------------===

cmake_minimum_required(VERSION 2.8)
project(l2p)

Expand Down
2 changes: 1 addition & 1 deletion l2p/Package.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//===- Package.cpp - Lineage II client package reader -----------*- C++ -*-===//
//
// L2Package
// L2PackageTools
//
// This file is distributed under the Simplified BSD License. See LICENSE.TXT
// for details.
Expand Down
2 changes: 1 addition & 1 deletion l2p/Package.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//===- Package.h - Lineage II client package reader -----------*- C++ -*-===//
//
// L2Package
// L2PackageTools
//
// This file is distributed under the Simplified BSD License. See LICENSE.TXT
// for details.
Expand Down
2 changes: 1 addition & 1 deletion l2p/UObject.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//===- UObject.cpp - Lineage II client package objects ----------*- C++ -*-===//
//
// L2Package
// L2PackageTools
//
// This file is distributed under the Simplified BSD License. See LICENSE.TXT
// for details.
Expand Down
9 changes: 9 additions & 0 deletions l2ptest/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
#===- l2ptest/CMakeLists.txt ------------------------------------------------===
#
# L2PackageTools
#
# This file is distributed under the Simplified BSD License. See LICENSE.TXT
# for details.
#
#===-------------------------------------------------------------------------===

cmake_minimum_required(VERSION 2.8)
project(l2ptest)

Expand Down
2 changes: 1 addition & 1 deletion l2ptest/l2ptest.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//===- l2ptest.cpp - Test for l2p -------------------------------*- C++ -*-===//
//
// L2Package
// L2PackageTools
//
// This file is distributed under the Simplified BSD License. See LICENSE.TXT
// for details.
Expand Down

0 comments on commit a7cd7ff

Please sign in to comment.