1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-27 14:57:44 +00:00

Merge pull request #238 from GokuWeedLord/scriptmove

move scripts dir to server_zone
This commit is contained in:
Mordred 2018-02-03 09:20:44 +01:00 committed by GitHub
commit 51ada2adc3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 3 additions and 3 deletions

2
.gitignore vendored
View file

@ -113,4 +113,4 @@ src/common/Version\.cpp
.mtime_cache .mtime_cache
# generated script loader files # generated script loader files
scripts/native/*/ScriptLoader.cpp src/servers/sapphire_zone/Script/Scripts/*/ScriptLoader.cpp

View file

@ -68,5 +68,3 @@ add_subdirectory("src/tools/exd_struct_gen")
add_subdirectory("src/tools/exd_struct_test") add_subdirectory("src/tools/exd_struct_test")
add_subdirectory("src/tools/quest_parser") add_subdirectory("src/tools/quest_parser")
#add_subdirectory("src/tools/pcb_reader") #add_subdirectory("src/tools/pcb_reader")
add_subdirectory("scripts/native")

View file

@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 2.6)
cmake_policy(SET CMP0015 NEW) cmake_policy(SET CMP0015 NEW)
cmake_policy(SET CMP0014 OLD) cmake_policy(SET CMP0014 OLD)
add_subdirectory("Script/Scripts")
project(sapphire_zone) project(sapphire_zone)
include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )