diff --git a/projectGenerator.xcodeproj/project.pbxproj b/projectGenerator.xcodeproj/project.pbxproj index f9af052..7e0a2ee 100644 --- a/projectGenerator.xcodeproj/project.pbxproj +++ b/projectGenerator.xcodeproj/project.pbxproj @@ -3,11 +3,10 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 44; objects = { /* Begin PBXBuildFile section */ - 1120712114AE3D360035CB7E /* libpugixml_d.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1120712014AE3D360035CB7E /* libpugixml_d.a */; }; 1120713014AE3D4F0035CB7E /* xcodeProject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1120712B14AE3D4F0035CB7E /* xcodeProject.cpp */; }; 1120713614AE3D840035CB7E /* ofAddon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1120713414AE3D840035CB7E /* ofAddon.cpp */; }; 113CAA5C14F88EDD00D3906E /* Utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 113CAA5914F88EDD00D3906E /* Utils.cpp */; }; @@ -27,8 +26,6 @@ 27C4A1BF179491920031C6E4 /* ofxSlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27C4A1B4179491920031C6E4 /* ofxSlider.cpp */; }; 27C4A1C0179491920031C6E4 /* ofxSliderGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27C4A1B6179491920031C6E4 /* ofxSliderGroup.cpp */; }; 27C4A1C1179491920031C6E4 /* ofxToggle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27C4A1B8179491920031C6E4 /* ofxToggle.cpp */; }; - 667FEFA41982A58D0061271D /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 667FEFA31982A58D0061271D /* CoreVideo.framework */; }; - BBAB23CB13894F3D00AA2426 /* GLUT.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = BBAB23BE13894E4700AA2426 /* GLUT.framework */; }; E4328149138ABC9F0047C5CB /* openFrameworksDebug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E4328148138ABC890047C5CB /* openFrameworksDebug.a */; }; E45BE97B0E8CC7DD009D7055 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9710E8CC7DD009D7055 /* AGL.framework */; }; E45BE97C0E8CC7DD009D7055 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9720E8CC7DD009D7055 /* ApplicationServices.framework */; }; @@ -38,13 +35,13 @@ E45BE9800E8CC7DD009D7055 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9760E8CC7DD009D7055 /* CoreFoundation.framework */; }; E45BE9810E8CC7DD009D7055 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9770E8CC7DD009D7055 /* CoreServices.framework */; }; E45BE9830E8CC7DD009D7055 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9790E8CC7DD009D7055 /* OpenGL.framework */; }; - E45BE9840E8CC7DD009D7055 /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE97A0E8CC7DD009D7055 /* QuickTime.framework */; }; E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */; }; E4B69E210A3A1BDC003C02F2 /* testApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; }; E4C2424710CC5A17004149E2 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424410CC5A17004149E2 /* AppKit.framework */; }; E4C2424810CC5A17004149E2 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424510CC5A17004149E2 /* Cocoa.framework */; }; E4C2424910CC5A17004149E2 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424610CC5A17004149E2 /* IOKit.framework */; }; - E4EB6799138ADC1D00A09F29 /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBAB23BE13894E4700AA2426 /* GLUT.framework */; }; + F59021A91B1B161F0073F41E /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F59021A81B1B161F0073F41E /* CoreVideo.framework */; }; + F59021B01B1B1DC30073F41E /* pugixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F59021AF1B1B1DC30073F41E /* pugixml.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -71,14 +68,12 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - BBAB23CB13894F3D00AA2426 /* GLUT.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 1120712014AE3D360035CB7E /* libpugixml_d.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpugixml_d.a; path = lib/libpugixml_d.a; sourceTree = ""; }; 1120712214AE3D410035CB7E /* foreach.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = foreach.hpp; path = src/pugixmlLib/contrib/foreach.hpp; sourceTree = SOURCE_ROOT; }; 1120712414AE3D4F0035CB7E /* baseProject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = baseProject.h; sourceTree = ""; }; 1120712B14AE3D4F0035CB7E /* xcodeProject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xcodeProject.cpp; sourceTree = ""; }; @@ -120,8 +115,6 @@ 27C4A1B7179491920031C6E4 /* ofxSliderGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxSliderGroup.h; sourceTree = ""; }; 27C4A1B8179491920031C6E4 /* ofxToggle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxToggle.cpp; sourceTree = ""; }; 27C4A1B9179491920031C6E4 /* ofxToggle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxToggle.h; sourceTree = ""; }; - 667FEFA31982A58D0061271D /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; }; - BBAB23BE13894E4700AA2426 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = ../../../libs/glut/lib/osx/GLUT.framework; sourceTree = ""; }; E4328143138ABC890047C5CB /* openFrameworksLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = openFrameworksLib.xcodeproj; path = ../../../libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj; sourceTree = SOURCE_ROOT; }; E45BE9710E8CC7DD009D7055 /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = /System/Library/Frameworks/AGL.framework; sourceTree = ""; }; E45BE9720E8CC7DD009D7055 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = ""; }; @@ -142,6 +135,8 @@ E4C2424610CC5A17004149E2 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; E4EB691F138AFCF100A09F29 /* CoreOF.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = CoreOF.xcconfig; path = ../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig; sourceTree = SOURCE_ROOT; }; E4EB6923138AFD0F00A09F29 /* Project.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Project.xcconfig; sourceTree = ""; }; + F59021A81B1B161F0073F41E /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; }; + F59021AF1B1B1DC30073F41E /* pugixml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pugixml.cpp; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -149,8 +144,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 667FEFA41982A58D0061271D /* CoreVideo.framework in Frameworks */, - E4EB6799138ADC1D00A09F29 /* GLUT.framework in Frameworks */, + F59021A91B1B161F0073F41E /* CoreVideo.framework in Frameworks */, E4328149138ABC9F0047C5CB /* openFrameworksDebug.a in Frameworks */, E45BE97B0E8CC7DD009D7055 /* AGL.framework in Frameworks */, E45BE97C0E8CC7DD009D7055 /* ApplicationServices.framework in Frameworks */, @@ -160,11 +154,9 @@ E45BE9800E8CC7DD009D7055 /* CoreFoundation.framework in Frameworks */, E45BE9810E8CC7DD009D7055 /* CoreServices.framework in Frameworks */, E45BE9830E8CC7DD009D7055 /* OpenGL.framework in Frameworks */, - E45BE9840E8CC7DD009D7055 /* QuickTime.framework in Frameworks */, E4C2424710CC5A17004149E2 /* AppKit.framework in Frameworks */, E4C2424810CC5A17004149E2 /* Cocoa.framework in Frameworks */, E4C2424910CC5A17004149E2 /* IOKit.framework in Frameworks */, - 1120712114AE3D360035CB7E /* libpugixml_d.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -230,7 +222,6 @@ 119B95D214A65CA0001E1E20 /* pugixmlLib */ = { isa = PBXGroup; children = ( - 1120712014AE3D360035CB7E /* libpugixml_d.a */, 119B95D514A65CA0001E1E20 /* src */, ); path = pugixmlLib; @@ -239,6 +230,7 @@ 119B95D514A65CA0001E1E20 /* src */ = { isa = PBXGroup; children = ( + F59021AF1B1B1DC30073F41E /* pugixml.cpp */, 1120712214AE3D410035CB7E /* foreach.hpp */, 119B95D714A65CA0001E1E20 /* pugiconfig.hpp */, 119B95D814A65CA0001E1E20 /* pugixml.hpp */, @@ -300,6 +292,7 @@ BBAB23C913894ECA00AA2426 /* system frameworks */ = { isa = PBXGroup; children = ( + F59021A81B1B161F0073F41E /* CoreVideo.framework */, E4C2424410CC5A17004149E2 /* AppKit.framework */, E4C2424510CC5A17004149E2 /* Cocoa.framework */, E4C2424610CC5A17004149E2 /* IOKit.framework */, @@ -316,14 +309,6 @@ name = "system frameworks"; sourceTree = ""; }; - BBAB23CA13894EDB00AA2426 /* 3rd party frameworks */ = { - isa = PBXGroup; - children = ( - BBAB23BE13894E4700AA2426 /* GLUT.framework */, - ); - name = "3rd party frameworks"; - sourceTree = ""; - }; E4328144138ABC890047C5CB /* Products */ = { isa = PBXGroup; children = ( @@ -335,7 +320,6 @@ E45BE5980E8CC70C009D7055 /* frameworks */ = { isa = PBXGroup; children = ( - BBAB23CA13894EDB00AA2426 /* 3rd party frameworks */, BBAB23C913894ECA00AA2426 /* system frameworks */, ); name = frameworks; @@ -344,7 +328,6 @@ E4B69B4A0A3A1720003C02F2 = { isa = PBXGroup; children = ( - 667FEFA31982A58D0061271D /* CoreVideo.framework */, E4B6FCAD0C3E899E008CF71C /* openFrameworks-Info.plist */, E4EB6923138AFD0F00A09F29 /* Project.xcconfig */, E4B69E1C0A3A1BDC003C02F2 /* src */, @@ -485,6 +468,7 @@ 27C4A1BE179491920031C6E4 /* ofxPanel.cpp in Sources */, 27C4A1BF179491920031C6E4 /* ofxSlider.cpp in Sources */, 27C4A1C0179491920031C6E4 /* ofxSliderGroup.cpp in Sources */, + F59021B01B1B1DC30073F41E /* pugixml.cpp in Sources */, 27C4A1C1179491920031C6E4 /* ofxToggle.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -504,7 +488,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = E4EB6923138AFD0F00A09F29 /* Project.xcconfig */; buildSettings = { - ARCHS = "$(NATIVE_ARCH)"; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CONFIGURATION_BUILD_DIR = "$(SRCROOT)/bin/"; COPY_PHASE_STRIP = NO; DEAD_CODE_STRIPPING = YES; @@ -531,7 +515,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = E4EB6923138AFD0F00A09F29 /* Project.xcconfig */; buildSettings = { - ARCHS = "$(NATIVE_ARCH)"; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CONFIGURATION_BUILD_DIR = "$(SRCROOT)/bin/"; COPY_PHASE_STRIP = YES; DEAD_CODE_STRIPPING = YES; @@ -563,6 +547,7 @@ FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + /Users/inx/Documents/_src/openFrameworks_orig/libs/glut/lib/osx, ); FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../libs/glut/lib/osx\""; GCC_DYNAMIC_NO_PIC = NO; @@ -638,14 +623,10 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_52)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", + "$(PROJECT_DIR)/src/pugixmlLib/lib", ); LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/src/pugixmlLib\""; LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/src/pugixmlLib/lib\""; - OTHER_CPLUSPLUSFLAGS = ( - "-D__MACOSX_CORE__", - "-lpthread", - "-DMAKE_IOS", - ); PREBINDING = NO; PRODUCT_NAME = "$(TARGET_NAME)Debug"; WRAPPER_EXTENSION = app; @@ -659,6 +640,7 @@ FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + /Users/inx/Documents/_src/openFrameworks_orig/libs/glut/lib/osx, ); FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../libs/glut/lib/osx\""; GCC_ENABLE_FIX_AND_CONTINUE = NO; @@ -733,14 +715,10 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_51)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", + "$(PROJECT_DIR)/src/pugixmlLib/lib", ); LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/src/pugixmlLib\""; LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/src/pugixmlLib/lib\""; - OTHER_CPLUSPLUSFLAGS = ( - "-D__MACOSX_CORE__", - "-lpthread", - "-DMAKE_IOS", - ); PREBINDING = NO; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; diff --git a/src/main.cpp b/src/main.cpp index 390bf81..da95ad4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,16 +1,9 @@ #include "ofMain.h" #include "testApp.h" -#include "ofAppGlutWindow.h" -#include "ofAppNoWindow.h" - //======================================================================== int main( int argc, char *argv[] ){ - - - ofAppGlutWindow window; - ofSetupOpenGL(&window, 1024, 610, OF_WINDOW); - testApp * app = new testApp; - //app->buildAllExamples = false; - ofRunApp( app ); + + ofSetupOpenGL(1024,610,OF_WINDOW); + ofRunApp(new testApp()); } diff --git a/src/pugixmlLib/Jamfile.jam b/src/pugixmlLib/Jamfile.jam deleted file mode 100644 index 6d329fb..0000000 --- a/src/pugixmlLib/Jamfile.jam +++ /dev/null @@ -1,167 +0,0 @@ -# Latest jamplus is needed to use this - -# Targets: -# pugixml - build pugixml library -# tests - build pugixml test suite -# run_tests - run pugixml test suite -# coverage - get test suite coverage - -# Options: -# toolset=name - select toolset -# supported toolsets: mingw*, msvc* - -# default toolset/configuration -if ( ! $(toolset) ) -{ - if ( $(OS) = SOLARIS ) - { - toolset = suncc ; - } - else if ( $(UNIX) ) - { - local GCCVERSION = [ Subst [ Shell "gcc -dumpversion" ] : $(NEWLINE) ] ; - toolset = "gcc"$(GCCVERSION) ; - } - else - { - toolset = msvc ; - } -} - -if ( ! $(configuration) ) -{ - configuration = "debug" ; -} - -if ( ! $(defines) ) -{ - defines = "PUGIXML_STANDARD" ; -} - -# coverage options -if ( $(toolset:I=^mingw) || $(toolset:I=^gcc) ) -{ - CCFLAGS = -fprofile-arcs -ftest-coverage ; - LDFLAGS = -fprofile-arcs ; - - if $(fullcoverage) - { - GCOVFLAGS = --branch-probabilities --function-summaries ; - } - else - { - GCOVFLAGS = --no-output ; - } -} - -# build folder -BUILD = build ; - -# enable dependency cache -DEPCACHE.standard = $(BUILD)/.depcache ; - -# rules -include "Jamrules.jam" ; - -# split define sets into list -local DEFINESETS = [ Split $(defines) : ':' ] ; - -# split configurations into list -local CONFIGURATIONS = [ Split $(configuration) : ',' ] ; - -for CONFIG in $(CONFIGURATIONS) -{ - for DEFINESET in $(DEFINESETS) - { - local DEFINES = [ Split $(DEFINESET) : ',' ] ; - - # build folder - local CFGBUILD = $(BUILD)/$(toolset)/$(DEFINES:J=_)/$(CONFIG) ; - - # compilation options - local CFGFLAGS = $(CCFLAGS) [ GetCFlags $(CONFIG) : $(DEFINES) ] ; - - # build library - local PUGIXML = $(CFGBUILD)/pugixml.lib ; - Library $(PUGIXML) : src/pugixml.cpp : $(CFGFLAGS) ; - Alias pugixml : $(PUGIXML) ; - - # build tests - local TESTS = $(CFGBUILD)/tests.exe ; - Application $(TESTS) : [ Glob tests : *.cpp ] : $(CFGFLAGS) : $(PUGIXML) ; - Alias tests : $(TESTS) ; - - # run tests - Test $(TESTS)_run : $(TESTS) ; - Alias run_tests : $(TESTS)_run ; - - # gather coverage - Coverage $(TESTS)_coverage : $(PUGIXML) ; - Alias coverage : $(TESTS)_coverage ; - - GCOVFLAGS on $(TESTS)_coverage = $(GCOVFLAGS) -o $(CFGBUILD)/src ; # because stupid gcov can't find files via relative paths - - # add special autotest markers to build log - if $(autotest) - { - COVPREFIX on $(TESTS)_coverage = "... autotest $(CONFIG) [$(DEFINESET)]" ; - } - - # gather coverage after tests run - Depends $(TESTS)_coverage : $(TESTS)_run ; - } -} - -# documentation -Documentation docs/manual.html : docs/manual.qbk : docs/manual.xsl ; -Documentation docs/quickstart.html : docs/quickstart.qbk : docs/quickstart.xsl ; - -Alias docs : docs/manual.html docs/quickstart.html ; - -# samples -for SAMPLE in [ Glob docs/samples : *.cpp ] -{ - local CONFIG = "debug" ; - local DEFINES = "PUGIXML_STANDARD" ; - - # build folder - local CFGBUILD = $(BUILD)/$(toolset)/$(DEFINES:J=_)/$(CONFIG) ; - - # compilation options - local CFGFLAGS = $(CCFLAGS) [ GetCFlags $(CONFIG) : $(DEFINES) ] ; - CFGFLAGS += -I src ; - - # build and run sample - local EXECUTABLE = $(CFGBUILD)/samples/$(SAMPLE:B).exe ; - local PUGIXML = $(CFGBUILD)/pugixml.lib ; - - Application $(EXECUTABLE) : $(SAMPLE) : $(CFGFLAGS) : $(PUGIXML) ; - - RunSampleAction $(EXECUTABLE)_run : $(EXECUTABLE) ; - Depends $(EXECUTABLE)_run : $(EXECUTABLE) ; - - Depends samples : $(EXECUTABLE)_run ; -} - -# release -VERSION = 1.0 ; -RELEASE_FILES = - [ Glob contrib : *.cpp *.hpp ] - [ Glob src : *.cpp *.hpp ] - [ Glob docs : *.html *.css ] - [ Glob docs/samples : *.cpp *.hpp *.xml ] - [ Glob docs/images : *.png ] - [ Glob docs/manual : *.html ] - @("scripts/**":W=:X=svn) - readme.txt - ; - -actions ArchiveAction -{ - perl tests/archive.pl $(<) $(>) -} - -ArchiveAction pugixml-$(VERSION).zip : $(RELEASE_FILES) ; -ArchiveAction pugixml-$(VERSION).tar.gz : $(RELEASE_FILES) ; -Depends release : pugixml-$(VERSION).zip pugixml-$(VERSION).tar.gz : $(RELEASE_FILES) ; -NotFile release ; diff --git a/src/pugixmlLib/Jamrules.jam b/src/pugixmlLib/Jamrules.jam deleted file mode 100644 index e3a76ce..0000000 --- a/src/pugixmlLib/Jamrules.jam +++ /dev/null @@ -1,807 +0,0 @@ -# Rules for Jamfile.jam - -if ( $(toolset:I=^mingw) || $(toolset:I=^gcc) ) -{ - if ( $(toolset:I=^gcc) ) - { - GCCPATH = "" ; - } - else - { - GCCPATH = "%$(toolset)_PATH%\\bin\\" ; - } - - if ( $(OS) != MACOSX ) - { - LDFLAGS += -static-libgcc -static ; - ARCH = "" ; - } - else - { - if ( $(toolset:I=_x64) ) - { - ARCH = -arch x86_64 ; - } - else if ( $(toolset:I=_ppc) ) - { - ARCH = -arch ppc ; - } - - LDFLAGS += $(ARCH) ; - } - - rule GetCFlags CONFIG : DEFINES - { - local RESULT = -D$(DEFINES) ; - - RESULT += -W -Wall -Wextra -Werror -pedantic ; - - if ( $(toolset:I=_0x) ) - { - RESULT += -std=c++0x ; - } - - if ( $(fulldebug) ) - { - RESULT += -g ; - } - - if ( $(CONFIG) = "debug" ) - { - RESULT += -D_DEBUG ; - } - else - { - RESULT += -DNDEBUG -O3 ; - } - - if ( PUGIXML_NO_EXCEPTIONS in $(DEFINES) ) - { - RESULT += -fno-exceptions ; - } - - RESULT += $(ARCH) ; - - return $(RESULT) ; - } - - actions ObjectAction - { - "$(GCCPATH)gcc" -c $(>) -o $(<) $(CCFLAGS) - } - - actions LibraryAction - { - "$(GCCPATH)ar" rcs $(<) $(>) - } - - actions LinkAction - { - "$(GCCPATH)g++" $(>) -o $(<) $(LDFLAGS) - } -} -else if ( $(toolset:I=^msvc) ) -{ - if ( $(fulldebug) ) - { - LDFLAGS += /DEBUG ; - } - - if ( $(toolset:I=x64$) ) - { - postfix = "\\amd64" ; - sdk_postfix = "\\x64" ; - LDFLAGS += /MACHINE:X64 ; - } - else - { - postfix = "" ; - sdk_postfix = "" ; - } - - rule GetCFlags CONFIG : DEFINES - { - local RESULT = /D$(DEFINES) ; - - if ( $(fulldebug) ) - { - RESULT += /Z7 ; - } - - if ( $(CONFIG) = "debug" ) - { - RESULT += /D_DEBUG /MTd ; - } - else - { - RESULT += /DNDEBUG /Ox /MT ; - } - - if ( $(toolset) = msvc7 || $(toolset) = msvc71 || $(toolset) = msvc8 ) - { - RESULT += /Wp64 ; # Wp64 is deprecated from msvc9 - } - - if ( $(toolset) != msvc6 ) - { - RESULT += /W4 ; - } - else - { - RESULT += /W3 ; # lots of warnings at W4 in standard library - } - - if ( ! ( PUGIXML_NO_EXCEPTIONS in $(DEFINES) ) ) - { - RESULT += /EHsc ; - } - else if ( $(toolset) = "msvc6" || $(toolset) = "msvc71" ) - { - # No no-exception STL in MSVC6, buggy no-exception STL in MSVC71 - RESULT += /EHsc ; - } - else - { - RESULT += /D_HAS_EXCEPTIONS=0 ; - } - - return $(RESULT) ; - } - - actions ObjectAction - { - "%$(toolset)_PATH%\bin$(postfix)\cl.exe" /WX /I"%$(toolset)_PATH%\include" /I"%$(toolset)_PATH%\PlatformSDK\include" /I"%WINSDK_PATH%\Include" /c $(>) /Fo$(<) /nologo $(CCFLAGS) - } - - actions LibraryAction - { - "%$(toolset)_PATH%\bin$(postfix)\lib.exe" /NOLOGO /OUT:$(<) $(>) - } - - actions LinkAction - { - "%$(toolset)_PATH%\bin$(postfix)\link.exe" /SUBSYSTEM:CONSOLE /NOLOGO /OUT:$(<) /PDB:$(<:S=.pdb) $(>) /LIBPATH:"%$(toolset)_PATH%\lib$(postfix)" /LIBPATH:"%$(toolset)_PATH%\PlatformSDK\lib$(postfix)" /LIBPATH:"%WINSDK_PATH%\Lib$(sdk_postfix)" $(LDFLAGS) - } -} -else if ( $(toolset:I=^ic) ) -{ - if ( $(toolset) = ic8 || $(toolset) = ic9 ) - { - msvc = "msvc71" ; - } - else - { - msvc = "msvc8" ; - } - - if ( $(toolset) = ic11 ) - { - postfix = "\\ia32" ; - } - else if ( $(toolset) = ic11_x64 ) - { - postfix = "\\intel64" ; - } - else - { - postfix = "" ; - } - - if ( $(toolset:I=_x64$) ) - { - msvc_postfix = "\\amd64" ; - LDFLAGS += /MACHINE:X64 ; - } - else - { - msvc_postfix = "" ; - } - - rule GetCFlags CONFIG : DEFINES - { - local RESULT = /D$(DEFINES) ; - - RESULT += /W3 /WX /Qvec_report0 ; - - if ( $(toolset) != ic8 ) - { - RESULT += /fp:precise ; - } - - if ( $(CONFIG) = "debug" ) - { - RESULT += /D_DEBUG /Od /MTd ; - } - else - { - RESULT += /DNDEBUG /Ox /MT ; - } - - if ( ! ( PUGIXML_NO_EXCEPTIONS in $(DEFINES) ) ) - { - RESULT += /EHsc ; - } - - return $(RESULT) ; - } - - actions ObjectAction - { - set PATH=%$(msvc)_PATH%\bin - "%$(toolset)_PATH%\bin$(postfix)\icl.exe" /I"%$(msvc)_PATH%\include" /I"%$(msvc)_PATH%\PlatformSDK\Include" /I"%$(toolset)_PATH%\include" /c $(>) /Fo$(<) /nologo $(CCFLAGS) - } - - actions LibraryAction - { - "%$(msvc)_PATH%\bin\lib.exe" /NOLOGO /OUT:$(<) $(>) - } - - actions LinkAction - { - "%$(msvc)_PATH%\bin\link.exe" /SUBSYSTEM:CONSOLE /NOLOGO /OUT:$(<) $(>) /LIBPATH:"%$(toolset)_PATH%\lib$(postfix)" /LIBPATH:"%$(msvc)_PATH%\lib$(msvc_postfix)" /LIBPATH:"%$(msvc)_PATH%\PlatformSDK\lib$(msvc_postfix)" $(LDFLAGS) - } -} -else if ( $(toolset:I=^dmc) ) -{ - rule GetCFlags CONFIG : DEFINES - { - local RESULT = -D$(DEFINES) ; - - RESULT += -wx -f ; - - if ( $(CONFIG) = "debug" ) - { - RESULT += -D_DEBUG ; - } - else - { - RESULT += -DNDEBUG -o ; - } - - if ( ! ( PUGIXML_NO_EXCEPTIONS in $(DEFINES) ) ) - { - RESULT += -Ae ; - } - - return $(RESULT) ; - } - - actions ObjectAction - { - "%$(toolset)_PATH%\bin\dmc.exe" -c -I%$(toolset)_PATH%\stlport\stlport $(>) -o$(<) $(CCFLAGS) - } - - actions LibraryAction - { - "%$(toolset)_PATH%\bin\lib.exe" -c $(<) $(>) - } - - actions LinkAction - { - "%$(toolset)_PATH%\bin\link.exe" $(>:\\) , $(<:\\) , nul , $(LDFLAGS:\\) -L/co/ma - } -} -else if ( $(toolset:I=^cw) ) -{ - cw_bin = "%$(toolset)_PATH%\\Other Metrowerks Tools\\Command Line Tools" ; - - rule GetCFlags CONFIG : DEFINES - { - local RESULT = -D$(DEFINES) ; - - RESULT += -cwd include -ansi strict -iso_templates on -msext off -w all,cmdline,iserror,nonotused,nonotinlined,noimplicitconv,nounwanted ; - - if ( $(CONFIG) = "debug" ) - { - RESULT += -D_DEBUG ; - } - else - { - RESULT += -DNDEBUG -O4 ; - } - - if ( PUGIXML_NO_EXCEPTIONS in $(DEFINES) ) - { - RESULT += -Cpp_exceptions off ; - } - - return $(RESULT) ; - } - - actions ObjectAction - { - "$(cw_bin)\mwcc.exe" -c $(>) -o $(<) $(CCFLAGS) - } - - actions LibraryAction - { - "$(cw_bin)\mwld.exe" -library -o $(<) $(>) - } - - actions LinkAction - { - "$(cw_bin)\mwld.exe" -subsystem console -o $(<) $(>) $(LDFLAGS) - } -} -else if ( $(toolset:I=^bcc) ) -{ - rule GetCFlags CONFIG : DEFINES - { - local RESULT = -D$(DEFINES) ; - - RESULT += -fp -w -w! -w-8026 -w-8027 -w-8091 -w-8004 ; - - if ( $(CONFIG) = "debug" ) - { - RESULT += -D_DEBUG ; - } - else - { - RESULT += -DNDEBUG -Ox ; - } - - return $(RESULT) ; - } - - actions ObjectAction - { - "%$(toolset)_PATH%\bin\bcc32.exe" $(CCFLAGS) -c -q -Q -o $(<) $(>) - } - - actions LibraryAction - { - "%$(toolset)_PATH%\bin\tlib.exe" /C $(<:\\) -+$(>:\\) - } - - actions LinkAction - { - "%$(toolset)_PATH%\bin\ilink32.exe" -L"%$(toolset)_PATH%\lib" -Tpe -ap -Gn -x -c "%$(toolset)_PATH%\lib\c0x32.obj" $(>:\\) , $(<:\\) , , $(LDFLAGS:\\) cw32 import32 - } -} -else if ( $(toolset:I=^suncc) ) -{ - if ( $(toolset:I=_x64) ) - { - ARCH = -m64 ; - } - else - { - ARCH = -m32 ; - } - - LDFLAGS += $(ARCH) ; - - rule GetCFlags CONFIG : DEFINES - { - local RESULT = -D$(DEFINES) ; - - RESULT += +w -xwe ; - - if ( $(CONFIG) = "debug" ) - { - RESULT += -D_DEBUG ; - } - else - { - RESULT += -DNDEBUG -O ; - } - - if ( PUGIXML_NO_EXCEPTIONS in $(DEFINES) ) - { - RESULT += -noex ; - } - - RESULT += $(ARCH) ; - - return $(RESULT) ; - } - - actions ObjectAction - { - sunCC $(CCFLAGS) -c -o $(<) $(>) - } - - actions LibraryAction - { - ar rcs $(<) $(>) - } - - actions LinkAction - { - sunCC $(>) -o $(<) $(LDFLAGS) - } -} -else if ( $(toolset:I=^xbox360) ) -{ - rule GetCFlags CONFIG : DEFINES - { - local RESULT = /D$(DEFINES) ; - - if ( $(CONFIG) = "debug" ) - { - RESULT += /D_DEBUG /MTd ; - } - else - { - RESULT += /DNDEBUG /Ox /MT ; - } - - RESULT += /W4 ; - - if ( ! ( PUGIXML_NO_EXCEPTIONS in $(DEFINES) ) ) - { - RESULT += /EHsc ; - } - else - { - RESULT += /D_HAS_EXCEPTIONS=0 ; - } - - return $(RESULT) ; - } - - actions ObjectAction - { - "%XEDK%\bin\win32\cl.exe" /WX /I"%XEDK%\include\xbox" /c $(>) /Fo$(<) /nologo $(CCFLAGS) - } - - actions LibraryAction - { - "%XEDK%\bin\win32\lib.exe" /NOLOGO /OUT:$(<) $(>) - } - - actions LinkAction - { - "%XEDK%\bin\win32\link.exe" /NOLOGO /OUT:$(<) /PDB:$(<:S=.pdb) $(>) /LIBPATH:"%XEDK%\lib\xbox" $(LDFLAGS) - } -} -else if ( $(toolset:I=^ps3_gcc) ) -{ - rule GetCFlags CONFIG : DEFINES - { - local RESULT = -D$(DEFINES) ; - - RESULT += -W -Wall -Wextra -Werror ; - - if ( $(CONFIG) = "debug" ) - { - RESULT += -D_DEBUG ; - } - else - { - RESULT += -DNDEBUG -O3 ; - } - - if ( PUGIXML_NO_EXCEPTIONS in $(DEFINES) ) - { - RESULT += -fno-exceptions ; - } - - return $(RESULT) ; - } - - actions ObjectAction - { - "%SCE_PS3_ROOT%\host-win32\ppu\bin\ppu-lv2-gcc" -c $(>) -o $(<) $(CCFLAGS) - } - - actions LibraryAction - { - "%SCE_PS3_ROOT%\host-win32\ppu\bin\ppu-lv2-ar" rcs $(<) $(>) - } - - actions LinkAction - { - "%SCE_PS3_ROOT%\host-win32\ppu\bin\ppu-lv2-g++" $(>) -o $(<) $(LDFLAGS) - } -} -else if ( $(toolset:I=^ps3_snc) ) -{ - rule GetCFlags CONFIG : DEFINES - { - local RESULT = -D$(DEFINES) ; - - RESULT += -Werror -Xuninitwarn=0 ; - - if ( $(CONFIG) = "debug" ) - { - RESULT += -D_DEBUG ; - } - else - { - RESULT += -DNDEBUG -O3 ; - } - - if ! ( PUGIXML_NO_EXCEPTIONS in $(DEFINES) ) - { - RESULT += -Xc+=exceptions ; - } - - return $(RESULT) ; - } - - actions ObjectAction - { - "%SCE_PS3_ROOT%\host-win32\sn\bin\ps3ppusnc" -c $(>) -o $(<) $(CCFLAGS) - } - - actions LibraryAction - { - "%SCE_PS3_ROOT%\host-win32\sn\bin\ps3snarl" rcs $(<) $(>) - } - - actions LinkAction - { - "%SCE_PS3_ROOT%\host-win32\sn\bin\ps3ppuld" $(>) -o $(<) $(LDFLAGS) - } -} -else -{ - exit "Unknown toolset $(toolset)!" ; -} - -COVSUCCESS = "echo $" "(COVPREFIX) success" ; - -if ( $(toolset:I=^mingw) || $(toolset:I=^gcc) ) -{ - actions maxtargets 1 CoverageAction - { - @($(COVSUCCESS:J=):A) - "$(GCCPATH)gcov" $(>) $(GCOVFLAGS) | perl tests/gcov-filter.pl $(COVPREFIX)$(SPACE)gcov - } -} -else -{ - actions CoverageAction - { - @($(COVSUCCESS:J=):A) - } -} - -if ( $(UNIX) ) -{ - actions screenoutput RunAction - { - $(>) - } - - actions RunSampleAction - { - cd docs/samples - ../../$(>) - } - - actions quietly ignore MakeDirAction - { - mkdir -p $(<) - } - - actions quietly ignore DeleteAction - { - rm -f $(>) - } -} -else -{ - if ( $(toolset:I=^(xbox360|ps3)) ) - { - actions RunAction - { - } - - actions RunSampleAction - { - } - } - else - { - actions screenoutput RunAction - { - $(>:\\) - } - - actions RunSampleAction - { - cd docs\samples - ..\..\$(>:\\) - } - } - - actions quietly ignore MakeDirAction - { - mkdir $(<:\\) >nul 2>&1 - } - - actions quietly ignore DeleteAction - { - del /F $(>:\\) >nul 2>&1 - } -} - -actions QuickbookAction -{ - %QUICKBOOK_PATH%\bin\quickbook.exe --output-file $(<) --input-file $(>) >nul -} - -actions response XSLTProcAction -{ - %QUICKBOOK_PATH%\bin\xsltproc.exe --path$(SPACE)$(XSLPATH:C) --stringparam$(SPACE)$(XSLPARAM) --output $(<) @( - - - ) $(>) -} - -rule MakeFileDir TARGET -{ - local DIR = $(TARGET:D) ; - - MakeDirAction $(DIR) ; - Needs $(TARGET) : $(DIR) ; -} - -rule Alias TARGET : SOURCE -{ - NotFile $(TARGET) ; - Always $(TARGET) ; - Depends $(TARGET) : $(SOURCE) ; -} - -rule Object TARGET : SOURCE : CCFLAGS -{ - HDRRULE on $(SOURCE) = C.HdrRule ; - HDRSCAN on $(SOURCE) = $(C.HDRPATTERN) ; - - MakeFileDir $(TARGET) ; - - ObjectAction $(TARGET) : $(SOURCE) ; - Depends $(TARGET) : $(SOURCE) ; - - CCFLAGS on $(TARGET) = $(CCFLAGS) ; - UseCommandLine $(TARGET) : $(CCFLAGS) ; -} - -rule Objects BUILD : SOURCES : CCFLAGS -{ - local OBJECTS ; - - for SOURCE in $(SOURCES) - { - local OBJECT = $(BUILD)/$(SOURCE:S=.o) ; - - Object $(OBJECT) : $(SOURCE) : $(CCFLAGS) ; - OBJECTS += $(OBJECT) ; - } - - return $(OBJECTS) ; -} - -rule Library TARGET : SOURCES : CCFLAGS -{ - # build object files - local OBJECTS = [ Objects $(TARGET:D) : $(SOURCES) : $(CCFLAGS) ] ; - - # build library - MakeFileDir $(TARGET) ; - LibraryAction $(TARGET) : $(OBJECTS) ; - Depends $(TARGET) : $(OBJECTS) ; - - # remember library objects for coverage - $(TARGET)_objects = $(OBJECTS) ; -} - -rule Application TARGET : SOURCES : CCFLAGS : LIBRARIES -{ - # build object files - local OBJECTS = [ Objects $(TARGET:D) : $(SOURCES) : $(CCFLAGS) ] ; - - # set libraries - LDFLAGS on $(TARGET) = $(LDFLAGS) $(LIBRARIES) ; - - # build application - MakeFileDir $(TARGET) ; - - LinkAction $(TARGET) : $(OBJECTS) ; - Depends $(TARGET) : $(OBJECTS) $(LIBRARIES) ; - - # remember executable objects for coverage - $(TARGET)_objects = $(OBJECTS) $($(LIBRARIES)_objects) ; -} - -rule CleanCoverage TARGET -{ - # make target - local CLEAN_TARGET = $(TARGET)_clean_coverage ; - - NotFile $(CLEAN_TARGET) ; - Always $(CLEAN_TARGET) ; - Depends $(TARGET) : $(CLEAN_TARGET) ; - - # clean object files - local FILES = $($(SOURCE)_objects:S=.gcda) ; - - # disable "independent target" warnings - NotFile $(FILES) ; - - DeleteAction $(CLEAN_TARGET) : $(FILES) ; -} - -rule Test TARGET : SOURCE -{ - # make alias - Alias $(TARGET) : $(SOURCE) ; - - # run tests - RunAction $(TARGET) : $(SOURCE) ; - - # remember executable objects for coverage - $(TARGET)_objects = $($(SOURCE)_objects) ; - - # clean coverage files before run - CleanCoverage $(TARGET) ; -} - -rule Coverage TARGET : SOURCE -{ - local FILES = $($(SOURCE)_objects:S=.gcda) ; - - # disable "independent target" warnings - NotFile $(FILES) ; - - CoverageAction $(TARGET) : $(FILES) ; - Depends $(TARGET) : $(SOURCE) ; -} - -rule QuickbookImport SOURCE : IMPORT -{ - Includes $(SOURCE) : $(SOURCE:D)/$(IMPORT) ; -} - -rule FullPath FILE -{ - local PWD = [ Subst [ Shell "cd" ] : "%c" : "" ] ; - return "$(PWD)/$(FILE)" ; -} - -rule Documentation TARGET : SOURCE : STYLESHEET -{ - # escape colon with %3A because colon is a path list separator - local XSLDIR = [ Subst $(QUICKBOOK_PATH) : ":" : "%%%%3A" ] ; - - # quickbook import scan - HDRRULE on $(SOURCE) = QuickbookImport ; - HDRSCAN on $(SOURCE) = "\\[import[ ]+([^]]*)\\]" ; - - # quickbook -> boostbook - local BOOSTBOOK = $(BUILD)/$(SOURCE:S=.bb.xml) ; - - MakeFileDir $(BOOSTBOOK) ; - QuickbookAction $(BOOSTBOOK) : $(SOURCE) ; - Depends $(BOOSTBOOK) : $(SOURCE) ; - - # boostbook -> docbook - local DOCBOOK = $(BUILD)/$(SOURCE:S=.db.xml) ; - - XSL on $(DOCBOOK) = $(QUICKBOOK_PATH)/boostbook/xsl/docbook.xsl ; - XSLPATH on $(DOCBOOK) = $(XSLDIR)/boostbook/dtd $(XSLDIR)/docbook-xml ; - XSLTProcAction $(DOCBOOK) : $(BOOSTBOOK) ; - Depends $(DOCBOOK) : $(BOOSTBOOK) ; - - # docbook -> html - local HTML = $(TARGET) ; - - XSL on $(HTML) = $(QUICKBOOK_PATH)/boostbook/xsl/html.xsl [ FullPath $(STYLESHEET) ] ; - XSLPATH on $(HTML) = $(XSLDIR)/docbook-xml $(XSLDIR)/docbook-xsl/html $(XSLDIR)/docbook-xsl/lib ; - - XSLPARAM on $(HTML) = - "generate.manifest 0" - "html.stylesheet pugixml.css" - "root.filename $(TARGET:B)" - "generate.section.toc.level 1" - "toc.section.depth 3" - "admon.graphics.path images/" - "navig.graphics.path images/" - ; - - XSLTProcAction $(HTML) : $(DOCBOOK) ; - Depends $(HTML) : $(DOCBOOK) $(STYLESHEET) ; -} diff --git a/src/pugixmlLib/contrib/foreach.hpp b/src/pugixmlLib/contrib/foreach.hpp index efe6d6d..c423151 100644 --- a/src/pugixmlLib/contrib/foreach.hpp +++ b/src/pugixmlLib/contrib/foreach.hpp @@ -7,6 +7,8 @@ #ifndef HEADER_PUGIXML_FOREACH_HPP #define HEADER_PUGIXML_FOREACH_HPP +#include + #include "pugixml.hpp" /* @@ -17,9 +19,6 @@ namespace boost { - template struct range_mutable_iterator; - template struct range_const_iterator; - template<> struct range_mutable_iterator { typedef pugi::xml_node::iterator type; @@ -50,52 +49,14 @@ namespace boost namespace pugi { - struct xml_node_children_adapter - { - typedef pugi::xml_node::iterator iterator; - typedef pugi::xml_node::iterator const_iterator; - - xml_node node; - - const_iterator begin() const - { - return node.begin(); - } - - const_iterator end() const - { - return node.end(); - } - }; - - xml_node_children_adapter children(const pugi::xml_node& node) + inline xml_object_range children(const pugi::xml_node& node) { - xml_node_children_adapter result = {node}; - return result; + return node.children(); } - struct xml_node_attribute_adapter - { - typedef pugi::xml_node::attribute_iterator iterator; - typedef pugi::xml_node::attribute_iterator const_iterator; - - xml_node node; - - const_iterator begin() const - { - return node.attributes_begin(); - } - - const_iterator end() const - { - return node.attributes_end(); - } - }; - - xml_node_attribute_adapter attributes(const pugi::xml_node& node) + inline xml_object_range attributes(const pugi::xml_node& node) { - xml_node_attribute_adapter result = {node}; - return result; + return node.attributes(); } } diff --git a/src/pugixmlLib/lib/libpugixml_d.a b/src/pugixmlLib/lib/libpugixml_d.a deleted file mode 100644 index d714146..0000000 Binary files a/src/pugixmlLib/lib/libpugixml_d.a and /dev/null differ diff --git a/src/pugixmlLib/readme.txt b/src/pugixmlLib/readme.txt index 9bf4d5f..faa41d3 100644 --- a/src/pugixmlLib/readme.txt +++ b/src/pugixmlLib/readme.txt @@ -1,6 +1,6 @@ -pugixml 1.0 - an XML processing library +pugixml 1.6 - an XML processing library -Copyright (C) 2006-2010, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com) +Copyright (C) 2006-2015, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com) Report bugs and download new versions at http://pugixml.org/ This is the distribution of pugixml, which is a C++ XML processing library, @@ -28,7 +28,7 @@ The distribution contains the following folders: This library is distributed under the MIT License: -Copyright (c) 2006-2010 Arseny Kapoulkine +Copyright (c) 2006-2015 Arseny Kapoulkine Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation diff --git a/src/pugixmlLib/scripts/CMakeLists.txt b/src/pugixmlLib/scripts/CMakeLists.txt index 6c748d6..6270ae5 100644 --- a/src/pugixmlLib/scripts/CMakeLists.txt +++ b/src/pugixmlLib/scripts/CMakeLists.txt @@ -1,5 +1,34 @@ project(pugixml) -set(SOURCES ../src/pugixml.hpp ../src/pugiconfig.hpp ../src/pugixml.cpp) +cmake_minimum_required(VERSION 2.6) -add_library(pugixml STATIC ${SOURCES}) +option(BUILD_SHARED_LIBS "Build shared instead of static library" OFF) +set(BUILD_DEFINES "" CACHE STRING "Build defines") + +# Pre-defines standard install locations on *nix systems. +include(GNUInstallDirs) +mark_as_advanced(CLEAR CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_INCLUDEDIR) + +set(HEADERS ../src/pugixml.hpp ../src/pugiconfig.hpp) +set(SOURCES ${HEADERS} ../src/pugixml.cpp) + +if(DEFINED BUILD_DEFINES) + add_definitions(${BUILD_DEFINES}) +endif() + +if(BUILD_SHARED_LIBS) + add_library(pugixml SHARED ${SOURCES}) +else() + add_library(pugixml STATIC ${SOURCES}) +endif() + +set_target_properties(pugixml PROPERTIES VERSION 1.6 SOVERSION 1) + +install(TARGETS pugixml EXPORT pugixml-config + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +) + +install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml) diff --git a/src/pugixmlLib/scripts/premake4.lua b/src/pugixmlLib/scripts/premake4.lua index 3584637..f1b89a0 100644 --- a/src/pugixmlLib/scripts/premake4.lua +++ b/src/pugixmlLib/scripts/premake4.lua @@ -5,11 +5,6 @@ local static = _ARGS[1] == 'static' local action = premake.action.current() if string.startswith(_ACTION, "vs") then - -- We need debugging symbols for all configurations, but runtime library depends on official Symbols flag, so hack it - function premake.vs200x_vcproj_symbols(cfg) - return 3 - end - if action then -- Disable solution generation function action.onsolution(sln) @@ -18,7 +13,19 @@ if string.startswith(_ACTION, "vs") then -- Rename output file function action.onproject(prj) - premake.generate(prj, "%%_" .. _ACTION .. (static and "_static" or "") .. ".vcproj", premake.vs200x_vcproj) + local name = "%%_" .. _ACTION .. (static and "_static" or "") + + if static then + for k, v in pairs(prj.project.__configs) do + v.objectsdir = v.objectsdir .. "Static" + end + end + + if _ACTION == "vs2010" then + premake.generate(prj, name .. ".vcxproj", premake.vs2010_vcxproj) + else + premake.generate(prj, name .. ".vcproj", premake.vs200x_vcproj) + end end end elseif _ACTION == "codeblocks" then @@ -50,10 +57,10 @@ if string.startswith(_ACTION, "vs") then configurations { "Debug", "Release" } if static then - configuration "Debug" targetsuffix "_sd" - configuration "Release" targetsuffix "_s" + configuration "Debug" targetsuffix "sd" + configuration "Release" targetsuffix "s" else - configuration "Debug" targetsuffix "_d" + configuration "Debug" targetsuffix "d" end else if _ACTION == "xcode3" then @@ -62,19 +69,18 @@ else configurations { "Debug", "Release" } - configuration "Debug" targetsuffix "_d" + configuration "Debug" targetsuffix "d" end project "pugixml" kind "StaticLib" language "C++" files { "../src/pugixml.hpp", "../src/pugiconfig.hpp", "../src/pugixml.cpp" } - flags { "NoPCH", "NoMinimalRebuild" } + flags { "NoPCH", "NoMinimalRebuild", "NoEditAndContinue", "Symbols" } uuid "89A1E353-E2DC-495C-B403-742BE206ACED" configuration "Debug" defines { "_DEBUG" } - flags { "Symbols" } configuration "Release" defines { "NDEBUG" } diff --git a/src/pugixmlLib/scripts/pugixml.xcodeproj/project.pbxproj b/src/pugixmlLib/scripts/pugixml.xcodeproj/project.pbxproj index 2e99f4b..7d56baf 100644 --- a/src/pugixmlLib/scripts/pugixml.xcodeproj/project.pbxproj +++ b/src/pugixmlLib/scripts/pugixml.xcodeproj/project.pbxproj @@ -7,18 +7,18 @@ objects = { /* Begin PBXBuildFile section */ - 5314084032B5001276189718 /* pugixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0E0405306C15001276189718 /* pugixml.cpp */; }; + 0424128F67AB5C730232235E /* pugixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 47481C4F0E03673E0E780637 /* pugixml.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 0A4C28F55399001276189718 /* pugiconfig.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = "pugiconfig.hpp"; path = "pugiconfig.hpp"; sourceTree = ""; }; - 0E0405306C15001276189718 /* pugixml.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "pugixml.cpp"; path = "pugixml.cpp"; sourceTree = ""; }; - 7C1A11945858001276189718 /* pugixml.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = "pugixml.hpp"; path = "pugixml.hpp"; sourceTree = ""; }; - 1DA04ADC64C3001276189718 /* libpugixml_d.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = "libpugixml_d.a"; path = "libpugixml_d.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 0B66463C5F896E6449051D38 /* pugiconfig.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = "pugiconfig.hpp"; path = "pugiconfig.hpp"; sourceTree = ""; }; + 47481C4F0E03673E0E780637 /* pugixml.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "pugixml.cpp"; path = "pugixml.cpp"; sourceTree = ""; }; + 6C911F0460FC44CD3B1B5624 /* pugixml.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = "pugixml.hpp"; path = "pugixml.hpp"; sourceTree = ""; }; + 1DA04ADC64C3566D16C45B6D /* libpugixmld.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = "libpugixmld.a"; path = "libpugixmld.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 47481C4F0E03001276189718 /* Frameworks */ = { + 2BA00212518037166623673F /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( @@ -28,52 +28,52 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 65DB0F6D27EA001276189718 /* pugixml */ = { + 19E0517F3CF26ED63AE23641 /* pugixml */ = { isa = PBXGroup; children = ( - 20852B6E3BB4001276189718 /* src */, - 578963B4309E001276189718 /* Products */, + 578963B4309E714F05E01D71 /* src */, + 219F66186DDF392149043810 /* Products */, ); - name = pugixml; + name = "pugixml"; sourceTree = ""; }; - 20852B6E3BB4001276189718 /* src */ = { + 578963B4309E714F05E01D71 /* src */ = { isa = PBXGroup; children = ( - 0A4C28F55399001276189718 /* pugiconfig.hpp */, - 0E0405306C15001276189718 /* pugixml.cpp */, - 7C1A11945858001276189718 /* pugixml.hpp */, + 0B66463C5F896E6449051D38 /* pugiconfig.hpp */, + 47481C4F0E03673E0E780637 /* pugixml.cpp */, + 6C911F0460FC44CD3B1B5624 /* pugixml.hpp */, ); - name = src; + name = "src"; path = ../src; sourceTree = ""; }; - 578963B4309E001276189718 /* Products */ = { + 219F66186DDF392149043810 /* Products */ = { isa = PBXGroup; children = ( - 1DA04ADC64C3001276189718 /* libpugixml_d.a */, + 1DA04ADC64C3566D16C45B6D /* libpugixmld.a */, ); - name = Products; + name = "Products"; sourceTree = ""; }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 566D16C45B6D001276189718 /* pugixml */ = { + 6B55152571905B6C3A6F39D0 /* pugixml */ = { isa = PBXNativeTarget; - buildConfigurationList = 714F05E01D71001276189718 /* Build configuration list for PBXNativeTarget "pugixml" */; + buildConfigurationList = 73BF376C14AA1ECC0AC517ED /* Build configuration list for PBXNativeTarget "pugixml" */; buildPhases = ( - 0B66463C5F89001276189718 /* Resources */, - 6E6449051D38001276189718 /* Sources */, - 47481C4F0E03001276189718 /* Frameworks */, + 6CA66B9B6252229A36E8733C /* Resources */, + 287808486FBF545206A47CC1 /* Sources */, + 2BA00212518037166623673F /* Frameworks */, ); buildRules = ( ); dependencies = ( ); - name = pugixml; - productName = pugixml; - productReference = 1DA04ADC64C3001276189718 /* libpugixml_d.a */; + name = "pugixml"; + productName = "pugixml"; + productReference = 1DA04ADC64C3566D16C45B6D /* libpugixmld.a */; productType = "com.apple.product-type.library.static"; }; /* End PBXNativeTarget section */ @@ -84,17 +84,17 @@ buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "pugixml" */; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 1; - mainGroup = 65DB0F6D27EA001276189718 /* pugixml */; + mainGroup = 19E0517F3CF26ED63AE23641 /* pugixml */; projectDirPath = ""; projectRoot = ""; targets = ( - 566D16C45B6D001276189718 /* libpugixml_d.a */, + 6B55152571905B6C3A6F39D0 /* libpugixmld.a */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 0B66463C5F89001276189718 /* Resources */ = { + 6CA66B9B6252229A36E8733C /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( @@ -104,11 +104,11 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 6E6449051D38001276189718 /* Sources */ = { + 287808486FBF545206A47CC1 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 5314084032B5001276189718 /* pugixml.cpp in Sources */, + 0424128F67AB5C730232235E /* pugixml.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -118,7 +118,7 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 6B5515257190001276189718 /* Debug */ = { + 4FDB54E4253E36FC55CE27E8 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -126,15 +126,14 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_MODEL_TUNING = G5; INSTALL_PATH = /usr/local/lib; - PRODUCT_NAME = "pugixml_d"; + PRODUCT_NAME = "pugixmld"; }; name = "Debug"; }; - 4FDB54E4253E001276189718 /* Release */ = { + 0A4C28F553990E0405306C15 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; CONFIGURATION_BUILD_DIR = xcode3; GCC_DYNAMIC_NO_PIC = NO; GCC_MODEL_TUNING = G5; @@ -143,7 +142,7 @@ }; name = "Release"; }; - 5B6C3A6F39D0001276189718 /* Debug */ = { + 65DB0F6D27EA20852B6E3BB4 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; @@ -151,7 +150,6 @@ CONFIGURATION_TEMP_DIR = "$(OBJROOT)"; COPY_PHASE_STRIP = NO; GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "_DEBUG", @@ -165,12 +163,13 @@ }; name = "Debug"; }; - 36FC55CE27E8001276189718 /* Release */ = { + 5314084032B57C1A11945858 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CONFIGURATION_BUILD_DIR = "$(SYMROOT)"; CONFIGURATION_TEMP_DIR = "$(OBJROOT)"; + COPY_PHASE_STRIP = NO; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_OPTIMIZATION_LEVEL = s; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -188,11 +187,11 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 714F05E01D71001276189718 /* Build configuration list for PBXNativeTarget "libpugixml_d.a" */ = { + 73BF376C14AA1ECC0AC517ED /* Build configuration list for PBXNativeTarget "libpugixmld.a" */ = { isa = XCConfigurationList; buildConfigurations = ( - 6B5515257190001276189718 /* Debug */, - 4FDB54E4253E001276189718 /* Release */, + 4FDB54E4253E36FC55CE27E8 /* Debug */, + 0A4C28F553990E0405306C15 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = "Debug"; @@ -200,8 +199,8 @@ 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "pugixml" */ = { isa = XCConfigurationList; buildConfigurations = ( - 5B6C3A6F39D0001276189718 /* Debug */, - 36FC55CE27E8001276189718 /* Release */, + 65DB0F6D27EA20852B6E3BB4 /* Debug */, + 5314084032B57C1A11945858 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = "Debug"; diff --git a/src/pugixmlLib/scripts/pugixml_airplay.mkf b/src/pugixmlLib/scripts/pugixml_airplay.mkf new file mode 100644 index 0000000..477f54a --- /dev/null +++ b/src/pugixmlLib/scripts/pugixml_airplay.mkf @@ -0,0 +1,13 @@ +includepaths +{ +"../src" +} + +files +{ +("../src") +pugiconfig.hpp +pugixml.cpp +pugixml.hpp +} + diff --git a/src/pugixmlLib/scripts/pugixml_codeblocks.cbp b/src/pugixmlLib/scripts/pugixml_codeblocks.cbp index 64a5320..e18ccfc 100644 --- a/src/pugixmlLib/scripts/pugixml_codeblocks.cbp +++ b/src/pugixmlLib/scripts/pugixml_codeblocks.cbp @@ -7,7 +7,7 @@