Changeset 58


Ignore:
Timestamp:
08/10/10 17:40:03 (18 months ago)
Author:
shiretu
Message:

-- last stage from common library refactoring

Location:
trunk
Files:
125 edited
6 moved

Legend:

Unmodified
Added
Removed

  • trunk/builders/cmake/common/CMakeLists.txt

    r56 r58  
    1515ADD_LIBRARY(common SHARED ${SOURCES}) 
    1616TARGET_LINK_LIBRARIES(common lua ${OPENSSL_LIBRARY_PATH} ${CRYPTO_LIBRARY_PATH}) 
    17 ADD_PRECOMPILED_HEADER(common ../../../sources/common/include/new/common.h)  
     17ADD_PRECOMPILED_HEADER(common ../../../sources/common/include/common.h)  
    1818 

  • trunk/builders/cmake/thelib/CMakeLists.txt

    r56 r58  
    1616ADD_LIBRARY(thelib SHARED ${SOURCES}) 
    1717TARGET_LINK_LIBRARIES(thelib common ${DL_LIBRARY_PATH} ${OPENSSL_LIBRARY_PATH} ${CRYPTO_LIBRARY_PATH}) 
    18 ADD_PRECOMPILED_HEADER(thelib ../../../sources/common/include/new/common.h) 
     18ADD_PRECOMPILED_HEADER(thelib ../../../sources/common/include/common.h) 
    1919 

  • trunk/builders/netbeans/osx/common/nbproject/Makefile-Debug.mk

    r56 r58  
    3434# Object Files 
    3535OBJECTFILES= \ 
    36         ${OBJECTDIR}/_ext/1319505222/androidplatform.o \ 
    37         ${OBJECTDIR}/_ext/1554816689/variant.o \ 
    38         ${OBJECTDIR}/_ext/235409714/tinyxmlerror.o \ 
    39         ${OBJECTDIR}/_ext/891379406/win32platform.o \ 
    40         ${OBJECTDIR}/_ext/1432319229/multiconsumerbuffer.o \ 
    41         ${OBJECTDIR}/_ext/1890074490/consoleloglocation.o \ 
    42         ${OBJECTDIR}/_ext/1554816689/file.o \ 
    43         ${OBJECTDIR}/_ext/235409714/tinyxml.o \ 
    44         ${OBJECTDIR}/_ext/1890074490/logger.o \ 
    45         ${OBJECTDIR}/_ext/1842641242/baseplatform.o \ 
    46         ${OBJECTDIR}/_ext/188702099/luautils.o \ 
    47         ${OBJECTDIR}/_ext/1554816689/timersmanager.o \ 
    48         ${OBJECTDIR}/_ext/2145541121/linuxplatform.o \ 
    49         ${OBJECTDIR}/_ext/1061913454/freebsdplatform.o \ 
    50         ${OBJECTDIR}/_ext/1554816689/genericfunctionality.o \ 
    51         ${OBJECTDIR}/_ext/301680863/osxplatform.o \ 
    52         ${OBJECTDIR}/_ext/1890074490/logcatloglocation.o \ 
    53         ${OBJECTDIR}/_ext/1806172918/solarisplatform.o \ 
    54         ${OBJECTDIR}/_ext/1797865588/mempool.o \ 
    55         ${OBJECTDIR}/_ext/1890074490/fileloglocation.o \ 
    56         ${OBJECTDIR}/_ext/1554816689/crypto.o \ 
    57         ${OBJECTDIR}/_ext/235409714/tinyxmlparser.o \ 
    58         ${OBJECTDIR}/_ext/1890074490/baseloglocation.o \ 
    59         ${OBJECTDIR}/_ext/1319505222/timegm.o \ 
    60         ${OBJECTDIR}/_ext/1554816689/mmapfile.o \ 
    61         ${OBJECTDIR}/_ext/1432319229/iobuffer.o 
     36        ${OBJECTDIR}/_ext/674965218/mmapfile.o \ 
     37        ${OBJECTDIR}/_ext/113024148/multiconsumerbuffer.o \ 
     38        ${OBJECTDIR}/_ext/674965218/variant.o \ 
     39        ${OBJECTDIR}/_ext/1980509653/timegm.o \ 
     40        ${OBJECTDIR}/_ext/1874657879/fileloglocation.o \ 
     41        ${OBJECTDIR}/_ext/1874657879/baseloglocation.o \ 
     42        ${OBJECTDIR}/_ext/113024148/iobuffer.o \ 
     43        ${OBJECTDIR}/_ext/230374975/strptime.o \ 
     44        ${OBJECTDIR}/_ext/230374975/timegm.o \ 
     45        ${OBJECTDIR}/_ext/1722917885/freebsdplatform.o \ 
     46        ${OBJECTDIR}/_ext/674965218/crypto.o \ 
     47        ${OBJECTDIR}/_ext/1145168487/timegm.o \ 
     48        ${OBJECTDIR}/_ext/1874657879/logcatloglocation.o \ 
     49        ${OBJECTDIR}/_ext/230374975/win32platform.o \ 
     50        ${OBJECTDIR}/_ext/765644641/tinyxmlerror.o \ 
     51        ${OBJECTDIR}/_ext/765644641/tinyxmlparser.o \ 
     52        ${OBJECTDIR}/_ext/674965218/file.o \ 
     53        ${OBJECTDIR}/_ext/1145168487/solarisplatform.o \ 
     54        ${OBJECTDIR}/_ext/1874657879/consoleloglocation.o \ 
     55        ${OBJECTDIR}/_ext/872974544/osxplatform.o \ 
     56        ${OBJECTDIR}/_ext/674965218/timersmanager.o \ 
     57        ${OBJECTDIR}/_ext/765644641/tinyxml.o \ 
     58        ${OBJECTDIR}/_ext/1874657879/logger.o \ 
     59        ${OBJECTDIR}/_ext/714509122/luautils.o \ 
     60        ${OBJECTDIR}/_ext/1998150091/baseplatform.o \ 
     61        ${OBJECTDIR}/_ext/230374975/strncasecmp.o \ 
     62        ${OBJECTDIR}/_ext/1267630661/mempool.o \ 
     63        ${OBJECTDIR}/_ext/1406839728/linuxplatform.o \ 
     64        ${OBJECTDIR}/_ext/1980509653/androidplatform.o 
    6265 
    6366 
    … …  
    8689        ${LINK.cc} -dynamiclib -install_name libcommon.dylib -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libcommon.dylib -fPIC ${OBJECTFILES} ${LDLIBSOPTIONS}  
    8790 
    88 ${OBJECTDIR}/_ext/1319505222/androidplatform.o: ../../../../sources/common/src/new/platform/android/androidplatform.cpp  
    89         ${MKDIR} -p ${OBJECTDIR}/_ext/1319505222 
    90         ${RM} $@.d 
    91         $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1319505222/androidplatform.o ../../../../sources/common/src/new/platform/android/androidplatform.cpp 
    92  
    93 ${OBJECTDIR}/_ext/1554816689/variant.o: ../../../../sources/common/src/new/utils/misc/variant.cpp  
    94         ${MKDIR} -p ${OBJECTDIR}/_ext/1554816689 
    95         ${RM} $@.d 
    96         $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1554816689/variant.o ../../../../sources/common/src/new/utils/misc/variant.cpp 
    97  
    98 ${OBJECTDIR}/_ext/235409714/tinyxmlerror.o: ../../../../sources/common/src/new/utils/tinyxml/tinyxmlerror.cpp  
    99         ${MKDIR} -p ${OBJECTDIR}/_ext/235409714 
    100         ${RM} $@.d 
    101         $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/235409714/tinyxmlerror.o ../../../../sources/common/src/new/utils/tinyxml/tinyxmlerror.cpp 
    102  
    103 ${OBJECTDIR}/_ext/891379406/win32platform.o: ../../../../sources/common/src/new/platform/windows/win32platform.cpp  
    104         ${MKDIR} -p ${OBJECTDIR}/_ext/891379406 
    105         ${RM} $@.d 
    106         $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/891379406/win32platform.o ../../../../sources/common/src/new/platform/windows/win32platform.cpp 
    107  
    108 ${OBJECTDIR}/_ext/1432319229/multiconsumerbuffer.o: ../../../../sources/common/src/new/utils/buffering/multiconsumerbuffer.cpp  
    109         ${MKDIR} -p ${OBJECTDIR}/_ext/1432319229 
    110         ${RM} $@.d 
    111         $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1432319229/multiconsumerbuffer.o ../../../../sources/common/src/new/utils/buffering/multiconsumerbuffer.cpp 
    112  
    113 ${OBJECTDIR}/_ext/1890074490/consoleloglocation.o: ../../../../sources/common/src/new/utils/logging/consoleloglocation.cpp  
    114         ${MKDIR} -p ${OBJECTDIR}/_ext/1890074490 
    115         ${RM} $@.d 
    116         $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1890074490/consoleloglocation.o ../../../../sources/common/src/new/utils/logging/consoleloglocation.cpp 
    117  
    118 ${OBJECTDIR}/_ext/1554816689/file.o: ../../../../sources/common/src/new/utils/misc/file.cpp  
    119         ${MKDIR} -p ${OBJECTDIR}/_ext/1554816689 
    120         ${RM} $@.d 
    121         $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1554816689/file.o ../../../../sources/common/src/new/utils/misc/file.cpp 
    122  
    123 ${OBJECTDIR}/_ext/235409714/tinyxml.o: ../../../../sources/common/src/new/utils/tinyxml/tinyxml.cpp  
    124         ${MKDIR} -p ${OBJECTDIR}/_ext/235409714 
    125         ${RM} $@.d 
    126         $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/235409714/tinyxml.o ../../../../sources/common/src/new/utils/tinyxml/tinyxml.cpp 
    127  
    128 ${OBJECTDIR}/_ext/1890074490/logger.o: ../../../../sources/common/src/new/utils/logging/logger.cpp  
    129         ${MKDIR} -p ${OBJECTDIR}/_ext/1890074490 
    130         ${RM} $@.d 
    131         $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1890074490/logger.o ../../../../sources/common/src/new/utils/logging/logger.cpp 
    132  
    133 ${OBJECTDIR}/_ext/1842641242/baseplatform.o: ../../../../sources/common/src/new/platform/baseplatform.cpp  
    134         ${MKDIR} -p ${OBJECTDIR}/_ext/1842641242 
    135         ${RM} $@.d 
    136         $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1842641242/baseplatform.o ../../../../sources/common/src/new/platform/baseplatform.cpp 
    137  
    138 ${OBJECTDIR}/_ext/188702099/luautils.o: ../../../../sources/common/src/new/utils/lua/luautils.cpp  
    139         ${MKDIR} -p ${OBJECTDIR}/_ext/188702099 
    140         ${RM} $@.d 
    141         $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/188702099/luautils.o ../../../../sources/common/src/new/utils/lua/luautils.cpp 
    142  
    143 ${OBJECTDIR}/_ext/1554816689/timersmanager.o: ../../../../sources/common/src/new/utils/misc/timersmanager.cpp  
    144         ${MKDIR} -p ${OBJECTDIR}/_ext/1554816689 
    145         ${RM} $@.d 
    146         $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1554816689/timersmanager.o ../../../../sources/common/src/new/utils/misc/timersmanager.cpp 
    147  
    148 ${OBJECTDIR}/_ext/2145541121/linuxplatform.o: ../../../../sources/common/src/new/platform/linux/linuxplatform.cpp  
    149         ${MKDIR} -p ${OBJECTDIR}/_ext/2145541121 
    150         ${RM} $@.d 
    151         $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/2145541121/linuxplatform.o ../../../../sources/common/src/new/platform/linux/linuxplatform.cpp 
    152  
    153 ${OBJECTDIR}/_ext/1061913454/freebsdplatform.o: ../../../../sources/common/src/new/platform/freebsd/freebsdplatform.cpp  
    154         ${MKDIR} -p ${OBJECTDIR}/_ext/1061913454 
    155         ${RM} $@.d 
    156         $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1061913454/freebsdplatform.o ../../../../sources/common/src/new/platform/freebsd/freebsdplatform.cpp 
    157  
    158 ${OBJECTDIR}/_ext/1554816689/genericfunctionality.o: ../../../../sources/common/src/new/utils/misc/genericfunctionality.cpp  
    159         ${MKDIR} -p ${OBJECTDIR}/_ext/1554816689 
    160         ${RM} $@.d 
    161         $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1554816689/genericfunctionality.o ../../../../sources/common/src/new/utils/misc/genericfunctionality.cpp 
    162  
    163 ${OBJECTDIR}/_ext/301680863/osxplatform.o: ../../../../sources/common/src/new/platform/osx/osxplatform.cpp  
    164         ${MKDIR} -p ${OBJECTDIR}/_ext/301680863 
    165         ${RM} $@.d 
    166         $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/301680863/osxplatform.o ../../../../sources/common/src/new/platform/osx/osxplatform.cpp 
    167  
    168 ${OBJECTDIR}/_ext/1890074490/logcatloglocation.o: ../../../../sources/common/src/new/utils/logging/logcatloglocation.cpp  
    169         ${MKDIR} -p ${OBJECTDIR}/_ext/1890074490 
    170         ${RM} $@.d 
    171         $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1890074490/logcatloglocation.o ../../../../sources/common/src/new/utils/logging/logcatloglocation.cpp 
    172  
    173 ${OBJECTDIR}/_ext/1806172918/solarisplatform.o: ../../../../sources/common/src/new/platform/solaris/solarisplatform.cpp  
    174         ${MKDIR} -p ${OBJECTDIR}/_ext/1806172918 
    175         ${RM} $@.d 
    176         $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1806172918/solarisplatform.o ../../../../sources/common/src/new/platform/solaris/solarisplatform.cpp 
    177  
    178 ${OBJECTDIR}/_ext/1797865588/mempool.o: ../../../../sources/common/src/new/utils/mempool/mempool.cpp  
    179         ${MKDIR} -p ${OBJECTDIR}/_ext/1797865588 
    180         ${RM} $@.d 
    181         $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1797865588/mempool.o ../../../../sources/common/src/new/utils/mempool/mempool.cpp 
    182  
    183 ${OBJECTDIR}/_ext/1890074490/fileloglocation.o: ../../../../sources/common/src/new/utils/logging/fileloglocation.cpp  
    184         ${MKDIR} -p ${OBJECTDIR}/_ext/1890074490 
    185         ${RM} $@.d 
    186         $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1890074490/fileloglocation.o ../../../../sources/common/src/new/utils/logging/fileloglocation.cpp 
    187  
    188 ${OBJECTDIR}/_ext/1554816689/crypto.o: ../../../../sources/common/src/new/utils/misc/crypto.cpp  
    189         ${MKDIR} -p ${OBJECTDIR}/_ext/1554816689 
    190         ${RM} $@.d 
    191         $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1554816689/crypto.o ../../../../sources/common/src/new/utils/misc/crypto.cpp 
    192  
    193 ${OBJECTDIR}/_ext/235409714/tinyxmlparser.o: ../../../../sources/common/src/new/utils/tinyxml/tinyxmlparser.cpp  
    194         ${MKDIR} -p ${OBJECTDIR}/_ext/235409714 
    195         ${RM} $@.d 
    196         $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/235409714/tinyxmlparser.o ../../../../sources/common/src/new/utils/tinyxml/tinyxmlparser.cpp 
    197  
    198 ${OBJECTDIR}/_ext/1890074490/baseloglocation.o: ../../../../sources/common/src/new/utils/logging/baseloglocation.cpp  
    199         ${MKDIR} -p ${OBJECTDIR}/_ext/1890074490 
    200         ${RM} $@.d 
    201         $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1890074490/baseloglocation.o ../../../../sources/common/src/new/utils/logging/baseloglocation.cpp 
    202  
    203 ${OBJECTDIR}/_ext/1319505222/timegm.o: ../../../../sources/common/src/new/platform/android/timegm.cpp  
    204         ${MKDIR} -p ${OBJECTDIR}/_ext/1319505222 
    205         ${RM} $@.d 
    206         $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1319505222/timegm.o ../../../../sources/common/src/new/platform/android/timegm.cpp 
    207  
    208 ${OBJECTDIR}/_ext/1554816689/mmapfile.o: ../../../../sources/common/src/new/utils/misc/mmapfile.cpp  
    209         ${MKDIR} -p ${OBJECTDIR}/_ext/1554816689 
    210         ${RM} $@.d 
    211         $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1554816689/mmapfile.o ../../../../sources/common/src/new/utils/misc/mmapfile.cpp 
    212  
    213 ${OBJECTDIR}/_ext/1432319229/iobuffer.o: ../../../../sources/common/src/new/utils/buffering/iobuffer.cpp  
    214         ${MKDIR} -p ${OBJECTDIR}/_ext/1432319229 
    215         ${RM} $@.d 
    216         $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1432319229/iobuffer.o ../../../../sources/common/src/new/utils/buffering/iobuffer.cpp 
     91${OBJECTDIR}/_ext/674965218/mmapfile.o: ../../../../sources/common/src/utils/misc/mmapfile.cpp  
     92        ${MKDIR} -p ${OBJECTDIR}/_ext/674965218 
     93        ${RM} $@.d 
     94        $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/674965218/mmapfile.o ../../../../sources/common/src/utils/misc/mmapfile.cpp 
     95 
     96${OBJECTDIR}/_ext/113024148/multiconsumerbuffer.o: ../../../../sources/common/src/utils/buffering/multiconsumerbuffer.cpp  
     97        ${MKDIR} -p ${OBJECTDIR}/_ext/113024148 
     98        ${RM} $@.d 
     99        $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/113024148/multiconsumerbuffer.o ../../../../sources/common/src/utils/buffering/multiconsumerbuffer.cpp 
     100 
     101${OBJECTDIR}/_ext/674965218/variant.o: ../../../../sources/common/src/utils/misc/variant.cpp  
     102        ${MKDIR} -p ${OBJECTDIR}/_ext/674965218 
     103        ${RM} $@.d 
     104        $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/674965218/variant.o ../../../../sources/common/src/utils/misc/variant.cpp 
     105 
     106${OBJECTDIR}/_ext/1980509653/timegm.o: ../../../../sources/common/src/platform/android/timegm.cpp  
     107        ${MKDIR} -p ${OBJECTDIR}/_ext/1980509653 
     108        ${RM} $@.d 
     109        $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1980509653/timegm.o ../../../../sources/common/src/platform/android/timegm.cpp 
     110 
     111${OBJECTDIR}/_ext/1874657879/fileloglocation.o: ../../../../sources/common/src/utils/logging/fileloglocation.cpp  
     112        ${MKDIR} -p ${OBJECTDIR}/_ext/1874657879 
     113        ${RM} $@.d 
     114        $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1874657879/fileloglocation.o ../../../../sources/common/src/utils/logging/fileloglocation.cpp 
     115 
     116${OBJECTDIR}/_ext/1874657879/baseloglocation.o: ../../../../sources/common/src/utils/logging/baseloglocation.cpp  
     117        ${MKDIR} -p ${OBJECTDIR}/_ext/1874657879 
     118        ${RM} $@.d 
     119        $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1874657879/baseloglocation.o ../../../../sources/common/src/utils/logging/baseloglocation.cpp 
     120 
     121${OBJECTDIR}/_ext/113024148/iobuffer.o: ../../../../sources/common/src/utils/buffering/iobuffer.cpp  
     122        ${MKDIR} -p ${OBJECTDIR}/_ext/113024148 
     123        ${RM} $@.d 
     124        $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/113024148/iobuffer.o ../../../../sources/common/src/utils/buffering/iobuffer.cpp 
     125 
     126${OBJECTDIR}/_ext/230374975/strptime.o: ../../../../sources/common/src/platform/windows/strptime.cpp  
     127        ${MKDIR} -p ${OBJECTDIR}/_ext/230374975 
     128        ${RM} $@.d 
     129        $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/230374975/strptime.o ../../../../sources/common/src/platform/windows/strptime.cpp 
     130 
     131${OBJECTDIR}/_ext/230374975/timegm.o: ../../../../sources/common/src/platform/windows/timegm.cpp  
     132        ${MKDIR} -p ${OBJECTDIR}/_ext/230374975 
     133        ${RM} $@.d 
     134        $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/230374975/timegm.o ../../../../sources/common/src/platform/windows/timegm.cpp 
     135 
     136${OBJECTDIR}/_ext/1722917885/freebsdplatform.o: ../../../../sources/common/src/platform/freebsd/freebsdplatform.cpp  
     137        ${MKDIR} -p ${OBJECTDIR}/_ext/1722917885 
     138        ${RM} $@.d 
     139        $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1722917885/freebsdplatform.o ../../../../sources/common/src/platform/freebsd/freebsdplatform.cpp 
     140 
     141${OBJECTDIR}/_ext/674965218/crypto.o: ../../../../sources/common/src/utils/misc/crypto.cpp  
     142        ${MKDIR} -p ${OBJECTDIR}/_ext/674965218 
     143        ${RM} $@.d 
     144        $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/674965218/crypto.o ../../../../sources/common/src/utils/misc/crypto.cpp 
     145 
     146${OBJECTDIR}/_ext/1145168487/timegm.o: ../../../../sources/common/src/platform/solaris/timegm.cpp  
     147        ${MKDIR} -p ${OBJECTDIR}/_ext/1145168487 
     148        ${RM} $@.d 
     149        $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1145168487/timegm.o ../../../../sources/common/src/platform/solaris/timegm.cpp 
     150 
     151${OBJECTDIR}/_ext/1874657879/logcatloglocation.o: ../../../../sources/common/src/utils/logging/logcatloglocation.cpp  
     152        ${MKDIR} -p ${OBJECTDIR}/_ext/1874657879 
     153        ${RM} $@.d 
     154        $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1874657879/logcatloglocation.o ../../../../sources/common/src/utils/logging/logcatloglocation.cpp 
     155 
     156${OBJECTDIR}/_ext/230374975/win32platform.o: ../../../../sources/common/src/platform/windows/win32platform.cpp  
     157        ${MKDIR} -p ${OBJECTDIR}/_ext/230374975 
     158        ${RM} $@.d 
     159        $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/230374975/win32platform.o ../../../../sources/common/src/platform/windows/win32platform.cpp 
     160 
     161${OBJECTDIR}/_ext/765644641/tinyxmlerror.o: ../../../../sources/common/src/utils/tinyxml/tinyxmlerror.cpp  
     162        ${MKDIR} -p ${OBJECTDIR}/_ext/765644641 
     163        ${RM} $@.d 
     164        $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/765644641/tinyxmlerror.o ../../../../sources/common/src/utils/tinyxml/tinyxmlerror.cpp 
     165 
     166${OBJECTDIR}/_ext/765644641/tinyxmlparser.o: ../../../../sources/common/src/utils/tinyxml/tinyxmlparser.cpp  
     167        ${MKDIR} -p ${OBJECTDIR}/_ext/765644641 
     168        ${RM} $@.d 
     169        $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/765644641/tinyxmlparser.o ../../../../sources/common/src/utils/tinyxml/tinyxmlparser.cpp 
     170 
     171${OBJECTDIR}/_ext/674965218/file.o: ../../../../sources/common/src/utils/misc/file.cpp  
     172        ${MKDIR} -p ${OBJECTDIR}/_ext/674965218 
     173        ${RM} $@.d 
     174        $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/674965218/file.o ../../../../sources/common/src/utils/misc/file.cpp 
     175 
     176${OBJECTDIR}/_ext/1145168487/solarisplatform.o: ../../../../sources/common/src/platform/solaris/solarisplatform.cpp  
     177        ${MKDIR} -p ${OBJECTDIR}/_ext/1145168487 
     178        ${RM} $@.d 
     179        $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1145168487/solarisplatform.o ../../../../sources/common/src/platform/solaris/solarisplatform.cpp 
     180 
     181${OBJECTDIR}/_ext/1874657879/consoleloglocation.o: ../../../../sources/common/src/utils/logging/consoleloglocation.cpp  
     182        ${MKDIR} -p ${OBJECTDIR}/_ext/1874657879 
     183        ${RM} $@.d 
     184        $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1874657879/consoleloglocation.o ../../../../sources/common/src/utils/logging/consoleloglocation.cpp 
     185 
     186${OBJECTDIR}/_ext/872974544/osxplatform.o: ../../../../sources/common/src/platform/osx/osxplatform.cpp  
     187        ${MKDIR} -p ${OBJECTDIR}/_ext/872974544 
     188        ${RM} $@.d 
     189        $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/872974544/osxplatform.o ../../../../sources/common/src/platform/osx/osxplatform.cpp 
     190 
     191${OBJECTDIR}/_ext/674965218/timersmanager.o: ../../../../sources/common/src/utils/misc/timersmanager.cpp  
     192        ${MKDIR} -p ${OBJECTDIR}/_ext/674965218 
     193        ${RM} $@.d 
     194        $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/674965218/timersmanager.o ../../../../sources/common/src/utils/misc/timersmanager.cpp 
     195 
     196${OBJECTDIR}/_ext/765644641/tinyxml.o: ../../../../sources/common/src/utils/tinyxml/tinyxml.cpp  
     197        ${MKDIR} -p ${OBJECTDIR}/_ext/765644641 
     198        ${RM} $@.d 
     199        $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/765644641/tinyxml.o ../../../../sources/common/src/utils/tinyxml/tinyxml.cpp 
     200 
     201${OBJECTDIR}/_ext/1874657879/logger.o: ../../../../sources/common/src/utils/logging/logger.cpp  
     202        ${MKDIR} -p ${OBJECTDIR}/_ext/1874657879 
     203        ${RM} $@.d 
     204        $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1874657879/logger.o ../../../../sources/common/src/utils/logging/logger.cpp 
     205 
     206${OBJECTDIR}/_ext/714509122/luautils.o: ../../../../sources/common/src/utils/lua/luautils.cpp  
     207        ${MKDIR} -p ${OBJECTDIR}/_ext/714509122 
     208        ${RM} $@.d 
     209        $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/714509122/luautils.o ../../../../sources/common/src/utils/lua/luautils.cpp 
     210 
     211${OBJECTDIR}/_ext/1998150091/baseplatform.o: ../../../../sources/common/src/platform/baseplatform.cpp  
     212        ${MKDIR} -p ${OBJECTDIR}/_ext/1998150091 
     213        ${RM} $@.d 
     214        $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1998150091/baseplatform.o ../../../../sources/common/src/platform/baseplatform.cpp 
     215 
     216${OBJECTDIR}/_ext/230374975/strncasecmp.o: ../../../../sources/common/src/platform/windows/strncasecmp.cpp  
     217        ${MKDIR} -p ${OBJECTDIR}/_ext/230374975 
     218        ${RM} $@.d 
     219        $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/230374975/strncasecmp.o ../../../../sources/common/src/platform/windows/strncasecmp.cpp 
     220 
     221${OBJECTDIR}/_ext/1267630661/mempool.o: ../../../../sources/common/src/utils/mempool/mempool.cpp  
     222        ${MKDIR} -p ${OBJECTDIR}/_ext/1267630661 
     223        ${RM} $@.d 
     224        $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1267630661/mempool.o ../../../../sources/common/src/utils/mempool/mempool.cpp 
     225 
     226${OBJECTDIR}/_ext/1406839728/linuxplatform.o: ../../../../sources/common/src/platform/linux/linuxplatform.cpp  
     227        ${MKDIR} -p ${OBJECTDIR}/_ext/1406839728 
     228        ${RM} $@.d 
     229        $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1406839728/linuxplatform.o ../../../../sources/common/src/platform/linux/linuxplatform.cpp 
     230 
     231${OBJECTDIR}/_ext/1980509653/androidplatform.o: ../../../../sources/common/src/platform/android/androidplatform.cpp  
     232        ${MKDIR} -p ${OBJECTDIR}/_ext/1980509653 
     233        ${RM} $@.d 
     234        $(COMPILE.cc) -g -DANDROID -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1980509653/androidplatform.o ../../../../sources/common/src/platform/android/androidplatform.cpp 
    217235 
    218236# Subprojects 

  • trunk/builders/netbeans/osx/common/nbproject/Makefile-Release.mk

    r56 r58  
    3434# Object Files 
    3535OBJECTFILES= \ 
    36         ${OBJECTDIR}/_ext/1319505222/androidplatform.o \ 
    37         ${OBJECTDIR}/_ext/1554816689/variant.o \ 
    38         ${OBJECTDIR}/_ext/235409714/tinyxmlerror.o \ 
    39         ${OBJECTDIR}/_ext/891379406/win32platform.o \ 
    40         ${OBJECTDIR}/_ext/1432319229/multiconsumerbuffer.o \ 
    41         ${OBJECTDIR}/_ext/1890074490/consoleloglocation.o \ 
    42         ${OBJECTDIR}/_ext/1554816689/file.o \ 
    43         ${OBJECTDIR}/_ext/235409714/tinyxml.o \ 
    44         ${OBJECTDIR}/_ext/1890074490/logger.o \ 
    45         ${OBJECTDIR}/_ext/1842641242/baseplatform.o \ 
    46         ${OBJECTDIR}/_ext/188702099/luautils.o \ 
    47         ${OBJECTDIR}/_ext/1554816689/timersmanager.o \ 
    48         ${OBJECTDIR}/_ext/2145541121/linuxplatform.o \ 
    49         ${OBJECTDIR}/_ext/1061913454/freebsdplatform.o \ 
    50         ${OBJECTDIR}/_ext/1554816689/genericfunctionality.o \ 
    51         ${OBJECTDIR}/_ext/301680863/osxplatform.o \ 
    52         ${OBJECTDIR}/_ext/1890074490/logcatloglocation.o \ 
    53         ${OBJECTDIR}/_ext/1806172918/solarisplatform.o \ 
    54         ${OBJECTDIR}/_ext/1797865588/mempool.o \ 
    55         ${OBJECTDIR}/_ext/1890074490/fileloglocation.o \ 
    56         ${OBJECTDIR}/_ext/1554816689/crypto.o \ 
    57         ${OBJECTDIR}/_ext/235409714/tinyxmlparser.o \ 
    58         ${OBJECTDIR}/_ext/1890074490/baseloglocation.o \ 
    59         ${OBJECTDIR}/_ext/1319505222/timegm.o \ 
    60         ${OBJECTDIR}/_ext/1554816689/mmapfile.o \ 
    61         ${OBJECTDIR}/_ext/1432319229/iobuffer.o 
     36        ${OBJECTDIR}/_ext/674965218/mmapfile.o \ 
     37        ${OBJECTDIR}/_ext/113024148/multiconsumerbuffer.o \ 
     38        ${OBJECTDIR}/_ext/674965218/variant.o \ 
     39        ${OBJECTDIR}/_ext/1980509653/timegm.o \ 
     40        ${OBJECTDIR}/_ext/1874657879/fileloglocation.o \ 
     41        ${OBJECTDIR}/_ext/1874657879/baseloglocation.o \ 
     42        ${OBJECTDIR}/_ext/113024148/iobuffer.o \ 
     43        ${OBJECTDIR}/_ext/230374975/strptime.o \ 
     44        ${OBJECTDIR}/_ext/230374975/timegm.o \ 
     45        ${OBJECTDIR}/_ext/1722917885/freebsdplatform.o \ 
     46        ${OBJECTDIR}/_ext/674965218/crypto.o \ 
     47        ${OBJECTDIR}/_ext/1145168487/timegm.o \ 
     48        ${OBJECTDIR}/_ext/1874657879/logcatloglocation.o \ 
     49        ${OBJECTDIR}/_ext/230374975/win32platform.o \ 
     50        ${OBJECTDIR}/_ext/765644641/tinyxmlerror.o \ 
     51        ${OBJECTDIR}/_ext/765644641/tinyxmlparser.o \ 
     52        ${OBJECTDIR}/_ext/674965218/file.o \ 
     53        ${OBJECTDIR}/_ext/1145168487/solarisplatform.o \ 
     54        ${OBJECTDIR}/_ext/1874657879/consoleloglocation.o \ 
     55        ${OBJECTDIR}/_ext/872974544/osxplatform.o \ 
     56        ${OBJECTDIR}/_ext/674965218/timersmanager.o \ 
     57        ${OBJECTDIR}/_ext/765644641/tinyxml.o \ 
     58        ${OBJECTDIR}/_ext/1874657879/logger.o \ 
     59        ${OBJECTDIR}/_ext/714509122/luautils.o \ 
     60        ${OBJECTDIR}/_ext/1998150091/baseplatform.o \ 
     61        ${OBJECTDIR}/_ext/230374975/strncasecmp.o \ 
     62        ${OBJECTDIR}/_ext/1267630661/mempool.o \ 
     63        ${OBJECTDIR}/_ext/1406839728/linuxplatform.o \ 
     64        ${OBJECTDIR}/_ext/1980509653/androidplatform.o 
    6265 
    6366 
    … …  
    8689        ${LINK.cc} -dynamiclib -install_name libcommon.dylib -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libcommon.dylib -fPIC ${OBJECTFILES} ${LDLIBSOPTIONS}  
    8790 
    88 ${OBJECTDIR}/_ext/1319505222/androidplatform.o: ../../../../sources/common/src/new/platform/android/androidplatform.cpp  
    89         ${MKDIR} -p ${OBJECTDIR}/_ext/1319505222 
    90         ${RM} $@.d 
    91         $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1319505222/androidplatform.o ../../../../sources/common/src/new/platform/android/androidplatform.cpp 
    92  
    93 ${OBJECTDIR}/_ext/1554816689/variant.o: ../../../../sources/common/src/new/utils/misc/variant.cpp  
    94         ${MKDIR} -p ${OBJECTDIR}/_ext/1554816689 
    95         ${RM} $@.d 
    96         $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1554816689/variant.o ../../../../sources/common/src/new/utils/misc/variant.cpp 
    97  
    98 ${OBJECTDIR}/_ext/235409714/tinyxmlerror.o: ../../../../sources/common/src/new/utils/tinyxml/tinyxmlerror.cpp  
    99         ${MKDIR} -p ${OBJECTDIR}/_ext/235409714 
    100         ${RM} $@.d 
    101         $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/235409714/tinyxmlerror.o ../../../../sources/common/src/new/utils/tinyxml/tinyxmlerror.cpp 
    102  
    103 ${OBJECTDIR}/_ext/891379406/win32platform.o: ../../../../sources/common/src/new/platform/windows/win32platform.cpp  
    104         ${MKDIR} -p ${OBJECTDIR}/_ext/891379406 
    105         ${RM} $@.d 
    106         $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/891379406/win32platform.o ../../../../sources/common/src/new/platform/windows/win32platform.cpp 
    107  
    108 ${OBJECTDIR}/_ext/1432319229/multiconsumerbuffer.o: ../../../../sources/common/src/new/utils/buffering/multiconsumerbuffer.cpp  
    109         ${MKDIR} -p ${OBJECTDIR}/_ext/1432319229 
    110         ${RM} $@.d 
    111         $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1432319229/multiconsumerbuffer.o ../../../../sources/common/src/new/utils/buffering/multiconsumerbuffer.cpp 
    112  
    113 ${OBJECTDIR}/_ext/1890074490/consoleloglocation.o: ../../../../sources/common/src/new/utils/logging/consoleloglocation.cpp  
    114         ${MKDIR} -p ${OBJECTDIR}/_ext/1890074490 
    115         ${RM} $@.d 
    116         $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1890074490/consoleloglocation.o ../../../../sources/common/src/new/utils/logging/consoleloglocation.cpp 
    117  
    118 ${OBJECTDIR}/_ext/1554816689/file.o: ../../../../sources/common/src/new/utils/misc/file.cpp  
    119         ${MKDIR} -p ${OBJECTDIR}/_ext/1554816689 
    120         ${RM} $@.d 
    121         $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1554816689/file.o ../../../../sources/common/src/new/utils/misc/file.cpp 
    122  
    123 ${OBJECTDIR}/_ext/235409714/tinyxml.o: ../../../../sources/common/src/new/utils/tinyxml/tinyxml.cpp  
    124         ${MKDIR} -p ${OBJECTDIR}/_ext/235409714 
    125         ${RM} $@.d 
    126         $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/235409714/tinyxml.o ../../../../sources/common/src/new/utils/tinyxml/tinyxml.cpp 
    127  
    128 ${OBJECTDIR}/_ext/1890074490/logger.o: ../../../../sources/common/src/new/utils/logging/logger.cpp  
    129         ${MKDIR} -p ${OBJECTDIR}/_ext/1890074490 
    130         ${RM} $@.d 
    131         $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1890074490/logger.o ../../../../sources/common/src/new/utils/logging/logger.cpp 
    132  
    133 ${OBJECTDIR}/_ext/1842641242/baseplatform.o: ../../../../sources/common/src/new/platform/baseplatform.cpp  
    134         ${MKDIR} -p ${OBJECTDIR}/_ext/1842641242 
    135         ${RM} $@.d 
    136         $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1842641242/baseplatform.o ../../../../sources/common/src/new/platform/baseplatform.cpp 
    137  
    138 ${OBJECTDIR}/_ext/188702099/luautils.o: ../../../../sources/common/src/new/utils/lua/luautils.cpp  
    139         ${MKDIR} -p ${OBJECTDIR}/_ext/188702099 
    140         ${RM} $@.d 
    141         $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/188702099/luautils.o ../../../../sources/common/src/new/utils/lua/luautils.cpp 
    142  
    143 ${OBJECTDIR}/_ext/1554816689/timersmanager.o: ../../../../sources/common/src/new/utils/misc/timersmanager.cpp  
    144         ${MKDIR} -p ${OBJECTDIR}/_ext/1554816689 
    145         ${RM} $@.d 
    146         $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1554816689/timersmanager.o ../../../../sources/common/src/new/utils/misc/timersmanager.cpp 
    147  
    148 ${OBJECTDIR}/_ext/2145541121/linuxplatform.o: ../../../../sources/common/src/new/platform/linux/linuxplatform.cpp  
    149         ${MKDIR} -p ${OBJECTDIR}/_ext/2145541121 
    150         ${RM} $@.d 
    151         $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/2145541121/linuxplatform.o ../../../../sources/common/src/new/platform/linux/linuxplatform.cpp 
    152  
    153 ${OBJECTDIR}/_ext/1061913454/freebsdplatform.o: ../../../../sources/common/src/new/platform/freebsd/freebsdplatform.cpp  
    154         ${MKDIR} -p ${OBJECTDIR}/_ext/1061913454 
    155         ${RM} $@.d 
    156         $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1061913454/freebsdplatform.o ../../../../sources/common/src/new/platform/freebsd/freebsdplatform.cpp 
    157  
    158 ${OBJECTDIR}/_ext/1554816689/genericfunctionality.o: ../../../../sources/common/src/new/utils/misc/genericfunctionality.cpp  
    159         ${MKDIR} -p ${OBJECTDIR}/_ext/1554816689 
    160         ${RM} $@.d 
    161         $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1554816689/genericfunctionality.o ../../../../sources/common/src/new/utils/misc/genericfunctionality.cpp 
    162  
    163 ${OBJECTDIR}/_ext/301680863/osxplatform.o: ../../../../sources/common/src/new/platform/osx/osxplatform.cpp  
    164         ${MKDIR} -p ${OBJECTDIR}/_ext/301680863 
    165         ${RM} $@.d 
    166         $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/301680863/osxplatform.o ../../../../sources/common/src/new/platform/osx/osxplatform.cpp 
    167  
    168 ${OBJECTDIR}/_ext/1890074490/logcatloglocation.o: ../../../../sources/common/src/new/utils/logging/logcatloglocation.cpp  
    169         ${MKDIR} -p ${OBJECTDIR}/_ext/1890074490 
    170         ${RM} $@.d 
    171         $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1890074490/logcatloglocation.o ../../../../sources/common/src/new/utils/logging/logcatloglocation.cpp 
    172  
    173 ${OBJECTDIR}/_ext/1806172918/solarisplatform.o: ../../../../sources/common/src/new/platform/solaris/solarisplatform.cpp  
    174         ${MKDIR} -p ${OBJECTDIR}/_ext/1806172918 
    175         ${RM} $@.d 
    176         $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1806172918/solarisplatform.o ../../../../sources/common/src/new/platform/solaris/solarisplatform.cpp 
    177  
    178 ${OBJECTDIR}/_ext/1797865588/mempool.o: ../../../../sources/common/src/new/utils/mempool/mempool.cpp  
    179         ${MKDIR} -p ${OBJECTDIR}/_ext/1797865588 
    180         ${RM} $@.d 
    181         $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1797865588/mempool.o ../../../../sources/common/src/new/utils/mempool/mempool.cpp 
    182  
    183 ${OBJECTDIR}/_ext/1890074490/fileloglocation.o: ../../../../sources/common/src/new/utils/logging/fileloglocation.cpp  
    184         ${MKDIR} -p ${OBJECTDIR}/_ext/1890074490 
    185         ${RM} $@.d 
    186         $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1890074490/fileloglocation.o ../../../../sources/common/src/new/utils/logging/fileloglocation.cpp 
    187  
    188 ${OBJECTDIR}/_ext/1554816689/crypto.o: ../../../../sources/common/src/new/utils/misc/crypto.cpp  
    189         ${MKDIR} -p ${OBJECTDIR}/_ext/1554816689 
    190         ${RM} $@.d 
    191         $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1554816689/crypto.o ../../../../sources/common/src/new/utils/misc/crypto.cpp 
    192  
    193 ${OBJECTDIR}/_ext/235409714/tinyxmlparser.o: ../../../../sources/common/src/new/utils/tinyxml/tinyxmlparser.cpp  
    194         ${MKDIR} -p ${OBJECTDIR}/_ext/235409714 
    195         ${RM} $@.d 
    196         $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/235409714/tinyxmlparser.o ../../../../sources/common/src/new/utils/tinyxml/tinyxmlparser.cpp 
    197  
    198 ${OBJECTDIR}/_ext/1890074490/baseloglocation.o: ../../../../sources/common/src/new/utils/logging/baseloglocation.cpp  
    199         ${MKDIR} -p ${OBJECTDIR}/_ext/1890074490 
    200         ${RM} $@.d 
    201         $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1890074490/baseloglocation.o ../../../../sources/common/src/new/utils/logging/baseloglocation.cpp 
    202  
    203 ${OBJECTDIR}/_ext/1319505222/timegm.o: ../../../../sources/common/src/new/platform/android/timegm.cpp  
    204         ${MKDIR} -p ${OBJECTDIR}/_ext/1319505222 
    205         ${RM} $@.d 
    206         $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1319505222/timegm.o ../../../../sources/common/src/new/platform/android/timegm.cpp 
    207  
    208 ${OBJECTDIR}/_ext/1554816689/mmapfile.o: ../../../../sources/common/src/new/utils/misc/mmapfile.cpp  
    209         ${MKDIR} -p ${OBJECTDIR}/_ext/1554816689 
    210         ${RM} $@.d 
    211         $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1554816689/mmapfile.o ../../../../sources/common/src/new/utils/misc/mmapfile.cpp 
    212  
    213 ${OBJECTDIR}/_ext/1432319229/iobuffer.o: ../../../../sources/common/src/new/utils/buffering/iobuffer.cpp  
    214         ${MKDIR} -p ${OBJECTDIR}/_ext/1432319229 
    215         ${RM} $@.d 
    216         $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1432319229/iobuffer.o ../../../../sources/common/src/new/utils/buffering/iobuffer.cpp 
     91${OBJECTDIR}/_ext/674965218/mmapfile.o: ../../../../sources/common/src/utils/misc/mmapfile.cpp  
     92        ${MKDIR} -p ${OBJECTDIR}/_ext/674965218 
     93        ${RM} $@.d 
     94        $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/674965218/mmapfile.o ../../../../sources/common/src/utils/misc/mmapfile.cpp 
     95 
     96${OBJECTDIR}/_ext/113024148/multiconsumerbuffer.o: ../../../../sources/common/src/utils/buffering/multiconsumerbuffer.cpp  
     97        ${MKDIR} -p ${OBJECTDIR}/_ext/113024148 
     98        ${RM} $@.d 
     99        $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/113024148/multiconsumerbuffer.o ../../../../sources/common/src/utils/buffering/multiconsumerbuffer.cpp 
     100 
     101${OBJECTDIR}/_ext/674965218/variant.o: ../../../../sources/common/src/utils/misc/variant.cpp  
     102        ${MKDIR} -p ${OBJECTDIR}/_ext/674965218 
     103        ${RM} $@.d 
     104        $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/674965218/variant.o ../../../../sources/common/src/utils/misc/variant.cpp 
     105 
     106${OBJECTDIR}/_ext/1980509653/timegm.o: ../../../../sources/common/src/platform/android/timegm.cpp  
     107        ${MKDIR} -p ${OBJECTDIR}/_ext/1980509653 
     108        ${RM} $@.d 
     109        $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1980509653/timegm.o ../../../../sources/common/src/platform/android/timegm.cpp 
     110 
     111${OBJECTDIR}/_ext/1874657879/fileloglocation.o: ../../../../sources/common/src/utils/logging/fileloglocation.cpp  
     112        ${MKDIR} -p ${OBJECTDIR}/_ext/1874657879 
     113        ${RM} $@.d 
     114        $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1874657879/fileloglocation.o ../../../../sources/common/src/utils/logging/fileloglocation.cpp 
     115 
     116${OBJECTDIR}/_ext/1874657879/baseloglocation.o: ../../../../sources/common/src/utils/logging/baseloglocation.cpp  
     117        ${MKDIR} -p ${OBJECTDIR}/_ext/1874657879 
     118        ${RM} $@.d 
     119        $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1874657879/baseloglocation.o ../../../../sources/common/src/utils/logging/baseloglocation.cpp 
     120 
     121${OBJECTDIR}/_ext/113024148/iobuffer.o: ../../../../sources/common/src/utils/buffering/iobuffer.cpp  
     122        ${MKDIR} -p ${OBJECTDIR}/_ext/113024148 
     123        ${RM} $@.d 
     124        $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/113024148/iobuffer.o ../../../../sources/common/src/utils/buffering/iobuffer.cpp 
     125 
     126${OBJECTDIR}/_ext/230374975/strptime.o: ../../../../sources/common/src/platform/windows/strptime.cpp  
     127        ${MKDIR} -p ${OBJECTDIR}/_ext/230374975 
     128        ${RM} $@.d 
     129        $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/230374975/strptime.o ../../../../sources/common/src/platform/windows/strptime.cpp 
     130 
     131${OBJECTDIR}/_ext/230374975/timegm.o: ../../../../sources/common/src/platform/windows/timegm.cpp  
     132        ${MKDIR} -p ${OBJECTDIR}/_ext/230374975 
     133        ${RM} $@.d 
     134        $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/230374975/timegm.o ../../../../sources/common/src/platform/windows/timegm.cpp 
     135 
     136${OBJECTDIR}/_ext/1722917885/freebsdplatform.o: ../../../../sources/common/src/platform/freebsd/freebsdplatform.cpp  
     137        ${MKDIR} -p ${OBJECTDIR}/_ext/1722917885 
     138        ${RM} $@.d 
     139        $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1722917885/freebsdplatform.o ../../../../sources/common/src/platform/freebsd/freebsdplatform.cpp 
     140 
     141${OBJECTDIR}/_ext/674965218/crypto.o: ../../../../sources/common/src/utils/misc/crypto.cpp  
     142        ${MKDIR} -p ${OBJECTDIR}/_ext/674965218 
     143        ${RM} $@.d 
     144        $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/674965218/crypto.o ../../../../sources/common/src/utils/misc/crypto.cpp 
     145 
     146${OBJECTDIR}/_ext/1145168487/timegm.o: ../../../../sources/common/src/platform/solaris/timegm.cpp  
     147        ${MKDIR} -p ${OBJECTDIR}/_ext/1145168487 
     148        ${RM} $@.d 
     149        $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1145168487/timegm.o ../../../../sources/common/src/platform/solaris/timegm.cpp 
     150 
     151${OBJECTDIR}/_ext/1874657879/logcatloglocation.o: ../../../../sources/common/src/utils/logging/logcatloglocation.cpp  
     152        ${MKDIR} -p ${OBJECTDIR}/_ext/1874657879 
     153        ${RM} $@.d 
     154        $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1874657879/logcatloglocation.o ../../../../sources/common/src/utils/logging/logcatloglocation.cpp 
     155 
     156${OBJECTDIR}/_ext/230374975/win32platform.o: ../../../../sources/common/src/platform/windows/win32platform.cpp  
     157        ${MKDIR} -p ${OBJECTDIR}/_ext/230374975 
     158        ${RM} $@.d 
     159        $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/230374975/win32platform.o ../../../../sources/common/src/platform/windows/win32platform.cpp 
     160 
     161${OBJECTDIR}/_ext/765644641/tinyxmlerror.o: ../../../../sources/common/src/utils/tinyxml/tinyxmlerror.cpp  
     162        ${MKDIR} -p ${OBJECTDIR}/_ext/765644641 
     163        ${RM} $@.d 
     164        $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/765644641/tinyxmlerror.o ../../../../sources/common/src/utils/tinyxml/tinyxmlerror.cpp 
     165 
     166${OBJECTDIR}/_ext/765644641/tinyxmlparser.o: ../../../../sources/common/src/utils/tinyxml/tinyxmlparser.cpp  
     167        ${MKDIR} -p ${OBJECTDIR}/_ext/765644641 
     168        ${RM} $@.d 
     169        $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/765644641/tinyxmlparser.o ../../../../sources/common/src/utils/tinyxml/tinyxmlparser.cpp 
     170 
     171${OBJECTDIR}/_ext/674965218/file.o: ../../../../sources/common/src/utils/misc/file.cpp  
     172        ${MKDIR} -p ${OBJECTDIR}/_ext/674965218 
     173        ${RM} $@.d 
     174        $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/674965218/file.o ../../../../sources/common/src/utils/misc/file.cpp 
     175 
     176${OBJECTDIR}/_ext/1145168487/solarisplatform.o: ../../../../sources/common/src/platform/solaris/solarisplatform.cpp  
     177        ${MKDIR} -p ${OBJECTDIR}/_ext/1145168487 
     178        ${RM} $@.d 
     179        $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1145168487/solarisplatform.o ../../../../sources/common/src/platform/solaris/solarisplatform.cpp 
     180 
     181${OBJECTDIR}/_ext/1874657879/consoleloglocation.o: ../../../../sources/common/src/utils/logging/consoleloglocation.cpp  
     182        ${MKDIR} -p ${OBJECTDIR}/_ext/1874657879 
     183        ${RM} $@.d 
     184        $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1874657879/consoleloglocation.o ../../../../sources/common/src/utils/logging/consoleloglocation.cpp 
     185 
     186${OBJECTDIR}/_ext/872974544/osxplatform.o: ../../../../sources/common/src/platform/osx/osxplatform.cpp  
     187        ${MKDIR} -p ${OBJECTDIR}/_ext/872974544 
     188        ${RM} $@.d 
     189        $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/872974544/osxplatform.o ../../../../sources/common/src/platform/osx/osxplatform.cpp 
     190 
     191${OBJECTDIR}/_ext/674965218/timersmanager.o: ../../../../sources/common/src/utils/misc/timersmanager.cpp  
     192        ${MKDIR} -p ${OBJECTDIR}/_ext/674965218 
     193        ${RM} $@.d 
     194        $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/674965218/timersmanager.o ../../../../sources/common/src/utils/misc/timersmanager.cpp 
     195 
     196${OBJECTDIR}/_ext/765644641/tinyxml.o: ../../../../sources/common/src/utils/tinyxml/tinyxml.cpp  
     197        ${MKDIR} -p ${OBJECTDIR}/_ext/765644641 
     198        ${RM} $@.d 
     199        $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/765644641/tinyxml.o ../../../../sources/common/src/utils/tinyxml/tinyxml.cpp 
     200 
     201${OBJECTDIR}/_ext/1874657879/logger.o: ../../../../sources/common/src/utils/logging/logger.cpp  
     202        ${MKDIR} -p ${OBJECTDIR}/_ext/1874657879 
     203        ${RM} $@.d 
     204        $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1874657879/logger.o ../../../../sources/common/src/utils/logging/logger.cpp 
     205 
     206${OBJECTDIR}/_ext/714509122/luautils.o: ../../../../sources/common/src/utils/lua/luautils.cpp  
     207        ${MKDIR} -p ${OBJECTDIR}/_ext/714509122 
     208        ${RM} $@.d 
     209        $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/714509122/luautils.o ../../../../sources/common/src/utils/lua/luautils.cpp 
     210 
     211${OBJECTDIR}/_ext/1998150091/baseplatform.o: ../../../../sources/common/src/platform/baseplatform.cpp  
     212        ${MKDIR} -p ${OBJECTDIR}/_ext/1998150091 
     213        ${RM} $@.d 
     214        $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1998150091/baseplatform.o ../../../../sources/common/src/platform/baseplatform.cpp 
     215 
     216${OBJECTDIR}/_ext/230374975/strncasecmp.o: ../../../../sources/common/src/platform/windows/strncasecmp.cpp  
     217        ${MKDIR} -p ${OBJECTDIR}/_ext/230374975 
     218        ${RM} $@.d 
     219        $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/230374975/strncasecmp.o ../../../../sources/common/src/platform/windows/strncasecmp.cpp 
     220 
     221${OBJECTDIR}/_ext/1267630661/mempool.o: ../../../../sources/common/src/utils/mempool/mempool.cpp  
     222        ${MKDIR} -p ${OBJECTDIR}/_ext/1267630661 
     223        ${RM} $@.d 
     224        $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1267630661/mempool.o ../../../../sources/common/src/utils/mempool/mempool.cpp 
     225 
     226${OBJECTDIR}/_ext/1406839728/linuxplatform.o: ../../../../sources/common/src/platform/linux/linuxplatform.cpp  
     227        ${MKDIR} -p ${OBJECTDIR}/_ext/1406839728 
     228        ${RM} $@.d 
     229        $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1406839728/linuxplatform.o ../../../../sources/common/src/platform/linux/linuxplatform.cpp 
     230 
     231${OBJECTDIR}/_ext/1980509653/androidplatform.o: ../../../../sources/common/src/platform/android/androidplatform.cpp  
     232        ${MKDIR} -p ${OBJECTDIR}/_ext/1980509653 
     233        ${RM} $@.d 
     234        $(COMPILE.cc) -O2 -DOSX -DUSE_MEM_POOL -DDEBUG_MEM_POOL -DLITTLE_ENDIAN_SHORT_ALIGNED -DHAS_LUA -I/opt/local/include -I../../../../sources/common/include -I/opt/local/include/libxml2 -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1980509653/androidplatform.o ../../../../sources/common/src/platform/android/androidplatform.cpp 
    217235 
    218236# Subprojects 

  • trunk/builders/netbeans/osx/common/nbproject/configurations.xml

    r56 r58  
    55                   displayName="Header Files" 
    66                   projectFiles="true"> 
    7       <logicalFolder name="new" displayName="new" projectFiles="true"> 
    8         <logicalFolder name="platform" 
    9                        displayName="platform" 
    10                        projectFiles="true" 
    11                        kind="SOURCE_LOGICAL_FOLDER"> 
    12           <logicalFolder name="android" 
    13                          displayName="android" 
    14                          projectFiles="true" 
    15                          kind="SOURCE_LOGICAL_FOLDER"> 
    16             <itemPath>../../../../sources/common/include/new/platform/android/androidplatform.h</itemPath> 
    17             <itemPath>../../../../sources/common/include/new/platform/android/max.h</itemPath> 
    18           </logicalFolder> 
    19           <logicalFolder name="endianess" 
    20                          displayName="endianess" 
    21                          projectFiles="true" 
    22                          kind="SOURCE_LOGICAL_FOLDER"> 
    23             <itemPath>../../../../sources/common/include/new/platform/endianess/big_endian_byte_aligned.h</itemPath> 
    24             <itemPath>../../../../sources/common/include/new/platform/endianess/big_endian_short_aligned.h</itemPath> 
    25             <itemPath>../../../../sources/common/include/new/platform/endianess/endianness.h</itemPath> 
    26             <itemPath>../../../../sources/common/include/new/platform/endianess/little_endian_byte_aligned.h</itemPath> 
    27             <itemPath>../../../../sources/common/include/new/platform/endianess/little_endian_short_aligned.h</itemPath> 
    28           </logicalFolder> 
    29           <logicalFolder name="freebsd" 
    30                          displayName="freebsd" 
    31                          projectFiles="true" 
    32                          kind="SOURCE_LOGICAL_FOLDER"> 
    33             <itemPath>../../../../sources/common/include/new/platform/freebsd/freebsdplatform.h</itemPath> 
    34           </logicalFolder> 
    35           <logicalFolder name="linux" 
    36                          displayName="linux" 
    37                          projectFiles="true" 
    38                          kind="SOURCE_LOGICAL_FOLDER"> 
    39             <itemPath>../../../../sources/common/include/new/platform/linux/linuxplatform.h</itemPath> 
    40             <itemPath>../../../../sources/common/include/new/platform/linux/max.h</itemPath> 
    41           </logicalFolder> 
    42           <logicalFolder name="osx" 
    43                          displayName="osx" 
    44                          projectFiles="true" 
    45                          kind="SOURCE_LOGICAL_FOLDER"> 
    46             <itemPath>../../../../sources/common/include/new/platform/osx/osxplatform.h</itemPath> 
    47           </logicalFolder> 
    48           <logicalFolder name="platforms" 
    49                          displayName="platforms" 
    50                          projectFiles="true" 
    51                          kind="SOURCE_LOGICAL_FOLDER"> 
    52           </logicalFolder> 
    53           <logicalFolder name="solaris" 
    54                          displayName="solaris" 
    55                          projectFiles="true" 
    56                          kind="SOURCE_LOGICAL_FOLDER"> 
    57             <itemPath>../../../../sources/common/include/new/platform/solaris/solarisplatform.h</itemPath> 
    58           </logicalFolder> 
    59           <logicalFolder name="windows" 
    60                          displayName="windows" 
    61                          projectFiles="true" 
    62                          kind="SOURCE_LOGICAL_FOLDER"> 
    63             <itemPath>../../../../sources/common/include/new/platform/windows/win32platform.h</itemPath> 
    64           </logicalFolder> 
    65           <itemPath>../../../../sources/common/include/new/platform/baseplatform.h</itemPath> 
    66           <itemPath>../../../../sources/common/include/new/platform/platform.h</itemPath> 
    67         </logicalFolder> 
    68         <logicalFolder name="utils" 
    69                        displayName="utils" 
    70                        projectFiles="true" 
    71                        kind="SOURCE_LOGICAL_FOLDER"> 
    72           <logicalFolder name="buffering" 
    73                          displayName="buffering" 
    74                          projectFiles="true" 
    75                          kind="SOURCE_LOGICAL_FOLDER"> 
    76             <itemPath>../../../../sources/common/include/new/utils/buffering/bitarray.h</itemPath> 
    77             <itemPath>../../../../sources/common/include/new/utils/buffering/buffering.h</itemPath> 
    78             <itemPath>../../../../sources/common/include/new/utils/buffering/iobuffer.h</itemPath> 
    79             <itemPath>../../../../sources/common/include/new/utils/buffering/multiconsumerbuffer.h</itemPath> 
    80           </logicalFolder> 
    81           <logicalFolder name="logging" 
    82                          displayName="logging" 
    83                          projectFiles="true" 
    84                          kind="SOURCE_LOGICAL_FOLDER"> 
    85             <itemPath>../../../../sources/common/include/new/utils/logging/baseloglocation.h</itemPath> 
    86             <itemPath>../../../../sources/common/include/new/utils/logging/consoleloglocation.h</itemPath> 
    87             <itemPath>../../../../sources/common/include/new/utils/logging/fileloglocation.h</itemPath> 
    88             <itemPath>../../../../sources/common/include/new/utils/logging/logcatloglocation.h</itemPath> 
    89             <itemPath>../../../../sources/common/include/new/utils/logging/logger.h</itemPath> 
    90             <itemPath>../../../../sources/common/include/new/utils/logging/logging.h</itemPath> 
    91           </logicalFolder> 
    92           <logicalFolder name="lua" 
    93                          displayName="lua" 
    94                          projectFiles="true" 
    95                          kind="SOURCE_LOGICAL_FOLDER"> 
    96             <itemPath>../../../../sources/common/include/new/utils/lua/luautils.h</itemPath> 
    97           </logicalFolder> 
    98           <logicalFolder name="mempool" 
    99                          displayName="mempool" 
    100                          projectFiles="true" 
    101                          kind="SOURCE_LOGICAL_FOLDER"> 
    102             <itemPath>../../../../sources/common/include/new/utils/mempool/mempool.h</itemPath> 
    103           </logicalFolder> 
    104           <logicalFolder name="misc" 
    105                          displayName="misc" 
    106                          projectFiles="true" 
    107                          kind="SOURCE_LOGICAL_FOLDER"> 
    108             <itemPath>../../../../sources/common/include/new/utils/misc/core.h</itemPath> 
    109             <itemPath>../../../../sources/common/include/new/utils/misc/crypto.h</itemPath> 
    110             <itemPath>../../../../sources/common/include/new/utils/misc/dhgroups.h</itemPath> 
    111             <itemPath>../../../../sources/common/include/new/utils/misc/file.h</itemPath> 
    112             <itemPath>../../../../sources/common/include/new/utils/misc/genericfunctionality.h</itemPath> 
    113             <itemPath>../../../../sources/common/include/new/utils/misc/linkedlist.h</itemPath> 
    114             <itemPath>../../../../sources/common/include/new/utils/misc/misc.h</itemPath> 
    115             <itemPath>../../../../sources/common/include/new/utils/misc/mmapfile.h</itemPath> 
    116             <itemPath>../../../../sources/common/include/new/utils/misc/timersmanager.h</itemPath> 
    117             <itemPath>../../../../sources/common/include/new/utils/misc/variant.h</itemPath> 
    118             <itemPath>../../../../sources/common/include/new/utils/misc/variantmap.h</itemPath> 
    119           </logicalFolder> 
    120           <logicalFolder name="tinyxml" 
    121                          displayName="tinyxml" 
    122                          projectFiles="true" 
    123                          kind="SOURCE_LOGICAL_FOLDER"> 
    124             <itemPath>../../../../sources/common/include/new/utils/tinyxml/tinyxml.h</itemPath> 
    125           </logicalFolder> 
    126           <itemPath>../../../../sources/common/include/new/utils/utils.h</itemPath> 
    127         </logicalFolder> 
    128         <itemPath>../../../../sources/common/include/new/common.h</itemPath> 
    129         <itemPath>../../../../sources/common/include/new/defines.h</itemPath> 
    130       </logicalFolder> 
     7      <logicalFolder name="platform" displayName="platform" projectFiles="true"> 
     8        <logicalFolder name="android" 
     9                       displayName="android" 
     10                       projectFiles="true" 
     11                       kind="SOURCE_LOGICAL_FOLDER"> 
     12          <itemPath>../../../../sources/common/include/platform/android/androidplatform.h</itemPath> 
     13          <itemPath>../../../../sources/common/include/platform/android/max.h</itemPath> 
     14        </logicalFolder> 
     15        <logicalFolder name="endianess" 
     16                       displayName="endianess" 
     17                       projectFiles="true" 
     18                       kind="SOURCE_LOGICAL_FOLDER"> 
     19          <itemPath>../../../../sources/common/include/platform/endianess/big_endian_byte_aligned.h</itemPath> 
     20          <itemPath>../../../../sources/common/include/platform/endianess/big_endian_short_aligned.h</itemPath> 
     21          <itemPath>../../../../sources/common/include/platform/endianess/endianness.h</itemPath> 
     22          <itemPath>../../../../sources/common/include/platform/endianess/little_endian_byte_aligned.h</itemPath> 
     23          <itemPath>../../../../sources/common/include/platform/endianess/little_endian_short_aligned.h</itemPath> 
     24        </logicalFolder> 
     25        <logicalFolder name="freebsd" 
     26                       displayName="freebsd" 
     27                       projectFiles="true" 
     28                       kind="SOURCE_LOGICAL_FOLDER"> 
     29          <itemPath>../../../../sources/common/include/platform/freebsd/freebsdplatform.h</itemPath> 
     30          <itemPath>../../../../sources/common/include/platform/freebsd/max.h</itemPath> 
     31        </logicalFolder> 
     32        <logicalFolder name="linux" 
     33                       displayName="linux" 
     34                       projectFiles="true" 
     35                       kind="SOURCE_LOGICAL_FOLDER"> 
     36          <itemPath>../../../../sources/common/include/platform/linux/linuxplatform.h</itemPath> 
     37          <itemPath>../../../../sources/common/include/platform/linux/max.h</itemPath> 
     38        </logicalFolder> 
     39        <logicalFolder name="osx" 
     40                       displayName="osx" 
     41                       projectFiles="true" 
     42                       kind="SOURCE_LOGICAL_FOLDER"> 
     43          <itemPath>../../../../sources/common/include/platform/osx/osxplatform.h</itemPath> 
     44        </logicalFolder> 
     45        <logicalFolder name="solaris" 
     46                       displayName="solaris" 
     47                       projectFiles="true" 
     48                       kind="SOURCE_LOGICAL_FOLDER"> 
     49          <itemPath>../../../../sources/common/include/platform/solaris/solarisplatform.h</itemPath> 
     50        </logicalFolder> 
     51        <logicalFolder name="windows" 
     52                       displayName="windows" 
     53                       projectFiles="true" 
     54                       kind="SOURCE_LOGICAL_FOLDER"> 
     55          <itemPath>../../../../sources/common/include/platform/windows/max.h</itemPath> 
     56          <itemPath>../../../../sources/common/include/platform/windows/win32platform.h</itemPath> 
     57        </logicalFolder> 
     58        <itemPath>../../../../sources/common/include/platform/baseplatform.h</itemPath> 
     59        <itemPath>../../../../sources/common/include/platform/platform.h</itemPath> 
     60      </logicalFolder> 
     61      <logicalFolder name="utils" displayName="utils" projectFiles="true"> 
     62        <logicalFolder name="buffering" 
     63                       displayName="buffering" 
     64                       projectFiles="true" 
     65                       kind="SOURCE_LOGICAL_FOLDER"> 
     66          <itemPath>../../../../sources/common/include/utils/buffering/bitarray.h</itemPath> 
     67          <itemPath>../../../../sources/common/include/utils/buffering/buffering.h</itemPath> 
     68          <itemPath>../../../../sources/common/include/utils/buffering/iobuffer.h</itemPath> 
     69          <itemPath>../../../../sources/common/include/utils/buffering/multiconsumerbuffer.h</itemPath> 
     70        </logicalFolder> 
     71        <logicalFolder name="logging" 
     72                       displayName="logging" 
     73                       projectFiles="true" 
     74                       kind="SOURCE_LOGICAL_FOLDER"> 
     75          <itemPath>../../../../sources/common/include/utils/logging/baseloglocation.h</itemPath> 
     76          <itemPath>../../../../sources/common/include/utils/logging/consoleloglocation.h</itemPath> 
     77          <itemPath>../../../../sources/common/include/utils/logging/fileloglocation.h</itemPath> 
     78          <itemPath>../../../../sources/common/include/utils/logging/logcatloglocation.h</itemPath> 
     79          <itemPath>../../../../sources/common/include/utils/logging/logger.h</itemPath> 
     80          <itemPath>../../../../sources/common/include/utils/logging/logging.h</itemPath> 
     81        </logicalFolder> 
     82        <logicalFolder name="lua" 
     83                       displayName="lua" 
     84                       projectFiles="true" 
     85                       kind="SOURCE_LOGICAL_FOLDER"> 
     86          <itemPath>../../../../sources/common/include/utils/lua/luautils.h</itemPath> 
     87        </logicalFolder> 
     88        <logicalFolder name="mempool" 
     89                       displayName="mempool" 
     90                       projectFiles="true" 
     91                       kind="SOURCE_LOGICAL_FOLDER"> 
     92          <itemPath>../../../../sources/common/include/utils/mempool/mempool.h</itemPath> 
     93        </logicalFolder> 
     94        <logicalFolder name="misc" 
     95                       displayName="misc" 
     96                       projectFiles="true" 
     97                       kind="SOURCE_LOGICAL_FOLDER"> 
     98          <itemPath>../../../../sources/common/include/utils/misc/crypto.h</itemPath> 
     99          <itemPath>../../../../sources/common/include/utils/misc/dhgroups.h</itemPath> 
     100          <itemPath>../../../../sources/common/include/utils/misc/file.h</itemPath> 
     101          <itemPath>../../../../sources/common/include/utils/misc/linkedlist.h</itemPath> 
     102          <itemPath>../../../../sources/common/include/utils/misc/misc.h</itemPath> 
     103          <itemPath>../../../../sources/common/include/utils/misc/mmapfile.h</itemPath> 
     104          <itemPath>../../../../sources/common/include/utils/misc/timersmanager.h</itemPath> 
     105          <itemPath>../../../../sources/common/include/utils/misc/variant.h</itemPath> 
     106          <itemPath>../../../../sources/common/include/utils/misc/variantmap.h</itemPath> 
     107        </logicalFolder> 
     108        <logicalFolder name="tinyxml" 
     109                       displayName="tinyxml" 
     110                       projectFiles="true" 
     111                       kind="SOURCE_LOGICAL_FOLDER"> 
     112          <itemPath>../../../../sources/common/include/utils/tinyxml/tinyxml.h</itemPath> 
     113        </logicalFolder> 
     114        <itemPath>../../../../sources/common/include/utils/utils.h</itemPath> 
     115      </logicalFolder> 
     116      <itemPath>../../../../sources/common/include/common.h</itemPath> 
     117      <itemPath>../../../../sources/common/include/defines.h</itemPath> 
    131118    </logicalFolder> 
    132119    <logicalFolder name="SourceFiles" 
    133120                   displayName="Source Files" 
    134121                   projectFiles="true"> 
    135       <logicalFolder name="new" displayName="new" projectFiles="true"> 
    136         <logicalFolder name="platform" 
    137                        displayName="platform" 
    138                        projectFiles="true" 
    139                        kind="SOURCE_LOGICAL_FOLDER"> 
    140           <logicalFolder name="android" 
    141                          displayName="android" 
    142                          projectFiles="true" 
    143                          kind="SOURCE_LOGICAL_FOLDER"> 
    144             <itemPath>../../../../sources/common/src/new/platform/android/androidplatform.cpp</itemPath> 
    145             <itemPath>../../../../sources/common/src/new/platform/android/timegm.cpp</itemPath> 
    146           </logicalFolder> 
    147           <logicalFolder name="freebsd" 
    148                          displayName="freebsd" 
    149                          projectFiles="true" 
    150                          kind="SOURCE_LOGICAL_FOLDER"> 
    151             <itemPath>../../../../sources/common/src/new/platform/freebsd/freebsdplatform.cpp</itemPath> 
    152           </logicalFolder> 
    153           <logicalFolder name="linux" 
    154                          displayName="linux" 
    155                          projectFiles="true" 
    156                          kind="SOURCE_LOGICAL_FOLDER"> 
    157             <itemPath>../../../../sources/common/src/new/platform/linux/linuxplatform.cpp</itemPath> 
    158           </logicalFolder> 
    159           <logicalFolder name="osx" 
    160                          displayName="osx" 
    161                          projectFiles="true" 
    162                          kind="SOURCE_LOGICAL_FOLDER"> 
    163             <itemPath>../../../../sources/common/src/new/platform/osx/osxplatform.cpp</itemPath> 
    164           </logicalFolder> 
    165           <logicalFolder name="platforms" 
    166                          displayName="platforms" 
    167                          projectFiles="true" 
    168                          kind="SOURCE_LOGICAL_FOLDER"> 
    169           </logicalFolder> 
    170           <logicalFolder name="solaris" 
    171                          displayName="solaris" 
    172                          projectFiles="true" 
    173                          kind="SOURCE_LOGICAL_FOLDER"> 
    174             <itemPath>../../../../sources/common/src/new/platform/solaris/solarisplatform.cpp</itemPath> 
    175           </logicalFolder> 
    176           <logicalFolder name="windows" 
    177                          displayName="windows" 
    178                          projectFiles="true" 
    179                          kind="SOURCE_LOGICAL_FOLDER"> 
    180             <itemPath>../../../../sources/common/src/new/platform/windows/win32platform.cpp</itemPath> 
    181           </logicalFolder> 
    182           <itemPath>../../../../sources/common/src/new/platform/baseplatform.cpp</itemPath> 
    183         </logicalFolder> 
    184         <logicalFolder name="utils" 
    185                        displayName="utils" 
    186                        projectFiles="true" 
    187                        kind="SOURCE_LOGICAL_FOLDER"> 
    188           <logicalFolder name="buffering" 
    189                          displayName="buffering" 
    190                          projectFiles="true" 
    191                          kind="SOURCE_LOGICAL_FOLDER"> 
    192             <itemPath>../../../../sources/common/src/new/utils/buffering/iobuffer.cpp</itemPath> 
    193             <itemPath>../../../../sources/common/src/new/utils/buffering/multiconsumerbuffer.cpp</itemPath> 
    194           </logicalFolder> 
    195           <logicalFolder name="logging" 
    196                          displayName="logging" 
    197                          projectFiles="true" 
    198                          kind="SOURCE_LOGICAL_FOLDER"> 
    199             <itemPath>../../../../sources/common/src/new/utils/logging/baseloglocation.cpp</itemPath> 
    200             <itemPath>../../../../sources/common/src/new/utils/logging/consoleloglocation.cpp</itemPath> 
    201             <itemPath>../../../../sources/common/src/new/utils/logging/fileloglocation.cpp</itemPath> 
    202             <itemPath>../../../../sources/common/src/new/utils/logging/logcatloglocation.cpp</itemPath> 
    203             <itemPath>../../../../sources/common/src/new/utils/logging/logger.cpp</itemPath> 
    204           </logicalFolder> 
    205           <logicalFolder name="lua" 
    206                          displayName="lua" 
    207                          projectFiles="true" 
    208                          kind="SOURCE_LOGICAL_FOLDER"> 
    209             <itemPath>../../../../sources/common/src/new/utils/lua/luautils.cpp</itemPath> 
    210           </logicalFolder> 
    211           <logicalFolder name="mempool" 
    212                          displayName="mempool" 
    213                          projectFiles="true" 
    214                          kind="SOURCE_LOGICAL_FOLDER"> 
    215             <itemPath>../../../../sources/common/src/new/utils/mempool/mempool.cpp</itemPath> 
    216           </logicalFolder> 
    217           <logicalFolder name="misc" 
    218                          displayName="misc" 
    219                          projectFiles="true" 
    220                          kind="SOURCE_LOGICAL_FOLDER"> 
    221             <itemPath>../../../../sources/common/src/new/utils/misc/crypto.cpp</itemPath> 
    222             <itemPath>../../../../sources/common/src/new/utils/misc/file.cpp</itemPath> 
    223             <itemPath>../../../../sources/common/src/new/utils/misc/genericfunctionality.cpp</itemPath> 
    224             <itemPath>../../../../sources/common/src/new/utils/misc/mmapfile.cpp</itemPath> 
    225             <itemPath>../../../../sources/common/src/new/utils/misc/timersmanager.cpp</itemPath> 
    226             <itemPath>../../../../sources/common/src/new/utils/misc/variant.cpp</itemPath> 
    227           </logicalFolder> 
    228           <logicalFolder name="tinyxml" 
    229                          displayName="tinyxml" 
    230                          projectFiles="true" 
    231                          kind="SOURCE_LOGICAL_FOLDER"> 
    232             <itemPath>../../../../sources/common/src/new/utils/tinyxml/tinyxml.cpp</itemPath> 
    233             <itemPath>../../../../sources/common/src/new/utils/tinyxml/tinyxmlerror.cpp</itemPath> 
    234             <itemPath>../../../../sources/common/src/new/utils/tinyxml/tinyxmlparser.cpp</itemPath> 
    235           </logicalFolder> 
     122      <logicalFolder name="platform" displayName="platform" projectFiles="true"> 
     123        <logicalFolder name="android" 
     124                       displayName="android" 
     125                       projectFiles="true" 
     126                       kind="SOURCE_LOGICAL_FOLDER"> 
     127          <itemPath>../../../../sources/common/src/platform/android/androidplatform.cpp</itemPath> 
     128          <itemPath>../../../../sources/common/src/platform/android/timegm.cpp</itemPath> 
     129        </logicalFolder> 
     130        <logicalFolder name="freebsd" 
     131                       displayName="freebsd" 
     132                       projectFiles="true" 
     133                       kind="SOURCE_LOGICAL_FOLDER"> 
     134          <itemPath>../../../../sources/common/src/platform/freebsd/freebsdplatform.cpp</itemPath> 
     135        </logicalFolder> 
     136        <logicalFolder name="linux" 
     137                       displayName="linux" 
     138                       projectFiles="true" 
     139                       kind="SOURCE_LOGICAL_FOLDER"> 
     140          <itemPath>../../../../sources/common/src/platform/linux/linuxplatform.cpp</itemPath> 
     141        </logicalFolder> 
     142        <logicalFolder name="osx" 
     143                       displayName="osx" 
     144                       projectFiles="true" 
     145                       kind="SOURCE_LOGICAL_FOLDER"> 
     146          <itemPath>../../../../sources/common/src/platform/osx/osxplatform.cpp</itemPath> 
     147        </logicalFolder> 
     148        <logicalFolder name="solaris" 
     149                       displayName="solaris" 
     150                       projectFiles="true" 
     151                       kind="SOURCE_LOGICAL_FOLDER"> 
     152          <itemPath>../../../../sources/common/src/platform/solaris/solarisplatform.cpp</itemPath> 
     153          <itemPath>../../../../sources/common/src/platform/solaris/timegm.cpp</itemPath> 
     154        </logicalFolder> 
     155        <logicalFolder name="windows" 
     156                       displayName="windows" 
     157                       projectFiles="true" 
     158                       kind="SOURCE_LOGICAL_FOLDER"> 
     159          <itemPath>../../../../sources/common/src/platform/windows/strncasecmp.cpp</itemPath> 
     160          <itemPath>../../../../sources/common/src/platform/windows/strptime.cpp</itemPath> 
     161          <itemPath>../../../../sources/common/src/platform/windows/timegm.cpp</itemPath> 
     162          <itemPath>../../../../sources/common/src/platform/windows/win32platform.cpp</itemPath> 
     163        </logicalFolder> 
     164        <itemPath>../../../../sources/common/src/platform/baseplatform.cpp</itemPath> 
     165      </logicalFolder> 
     166      <logicalFolder name="utils" displayName="utils" projectFiles="true"> 
     167        <logicalFolder name="buffering" 
     168                       displayName="buffering" 
     169                       projectFiles="true" 
     170                       kind="SOURCE_LOGICAL_FOLDER"> 
     171          <itemPath>../../../../sources/common/src/utils/buffering/iobuffer.cpp</itemPath> 
     172          <itemPath>../../../../sources/common/src/utils/buffering/multiconsumerbuffer.cpp</itemPath> 
     173        </logicalFolder> 
     174        <logicalFolder name="logging" 
     175                       displayName="logging" 
     176                       projectFiles="true" 
     177                       kind="SOURCE_LOGICAL_FOLDER"> 
     178          <itemPath>../../../../sources/common/src/utils/logging/baseloglocation.cpp</itemPath> 
     179          <itemPath>../../../../sources/common/src/utils/logging/consoleloglocation.cpp</itemPath> 
     180          <itemPath>../../../../sources/common/src/utils/logging/fileloglocation.cpp</itemPath> 
     181          <itemPath>../../../../sources/common/src/utils/logging/logcatloglocation.cpp</itemPath> 
     182          <itemPath>../../../../sources/common/src/utils/logging/logger.cpp</itemPath> 
     183        </logicalFolder> 
     184        <logicalFolder name="lua" 
     185                       displayName="lua" 
     186                       projectFiles="true" 
     187                       kind="SOURCE_LOGICAL_FOLDER"> 
     188          <itemPath>../../../../sources/common/src/utils/lua/luautils.cpp</itemPath> 
     189        </logicalFolder> 
     190        <logicalFolder name="mempool" 
     191                       displayName="mempool" 
     192                       projectFiles="true" 
     193                       kind="SOURCE_LOGICAL_FOLDER"> 
     194          <itemPath>../../../../sources/common/src/utils/mempool/mempool.cpp</itemPath> 
     195        </logicalFolder> 
     196        <logicalFolder name="misc" 
     197                       displayName="misc" 
     198                       projectFiles="true" 
     199                       kind="SOURCE_LOGICAL_FOLDER"> 
     200          <itemPath>../../../../sources/common/src/utils/misc/crypto.cpp</itemPath> 
     201          <itemPath>../../../../sources/common/src/utils/misc/file.cpp</itemPath> 
     202          <itemPath>../../../../sources/common/src/utils/misc/mmapfile.cpp</itemPath> 
     203          <itemPath>../../../../sources/common/src/utils/misc/timersmanager.cpp</itemPath> 
     204          <itemPath>../../../../sources/common/src/utils/misc/variant.cpp</itemPath> 
     205        </logicalFolder> 
     206        <logicalFolder name="tinyxml" 
     207                       displayName="tinyxml" 
     208                       projectFiles="true" 
     209                       kind="SOURCE_LOGICAL_FOLDER"> 
     210          <itemPath>../../../../sources/common/src/utils/tinyxml/tinyxml.cpp</itemPath> 
     211          <itemPath>../../../../sources/common/src/utils/tinyxml/tinyxmlerror.cpp</itemPath> 
     212          <itemPath>../../../../sources/common/src/utils/tinyxml/tinyxmlparser.cpp</itemPath> 
    236213        </logicalFolder> 
    237214      </logicalFolder> 
    … …  
    244221  </logicalFolder> 
    245222  <sourceRootList> 
    246     <Elem>../../../../sources/common/src/new</Elem> 
    247     <Elem>../../../../sources/common/include/new</Elem> 
     223    <Elem>../../../../sources/common/include/platform</Elem> 
     224    <Elem>../../../../sources/common/include/utils</Elem> 
     225    <Elem>../../../../sources/common/src/platform</Elem> 
     226    <Elem>../../../../sources/common/src/utils</Elem> 
    248227  </sourceRootList> 
    249228  <projectmakefile>Makefile.nb</projectmakefile> 

  • trunk/builders/netbeans/osx/common/nbproject/private/configurations.xml

    r26 r58  
    66    <conf name="Debug" type="2"> 
    77      <gizmo_options version="3"> 
     8        <configurationname>GizmoSimple</configurationname> 
    89      </gizmo_options> 
    910      <runprofile version="6"> 
    … …  
    2021    <conf name="Release" type="2"> 
    2122      <gizmo_options version="3"> 
     23        <configurationname>GizmoSimple</configurationname> 
    2224      </gizmo_options> 
    2325      <runprofile version="6"> 

  • trunk/builders/netbeans/osx/common/nbproject/project.xml

    r56 r58  
    1212            <make-dep-projects/> 
    1313            <sourceRootList> 
    14                 <sourceRootElem>../../../../sources/common/src/new</sourceRootElem> 
    15                 <sourceRootElem>../../../../sources/common/include/new</sourceRootElem> 
     14                <sourceRootElem>../../../../sources/common/include/platform</sourceRootElem> 
     15                <sourceRootElem>../../../../sources/common/include/utils</sourceRootElem> 
     16                <sourceRootElem>../../../../sources/common/src/platform</sourceRootElem> 
     17                <sourceRootElem>../../../../sources/common/src/utils</sourceRootElem> 
    1618            </sourceRootList> 
    1719            <confList> 

  • trunk/sources/androidapplestreaming/include/api.h

    r56 r58  
    2121#define _API_H 
    2222 
    23 #include "new/common.h" 
     23#include "common.h" 
    2424 
    2525void EnvRun(string ip, uint16_t port); 

  • trunk/sources/androidapplestreaming/include/jniwrapper.h

    r56 r58  
    2222 
    2323#include <jni.h> 
    24 #include "new/common.h" 
     24#include "common.h" 
    2525 
    2626extern "C" void Java_com_rtmpd_CommandsInterface_EnvRun( 

  • trunk/sources/androidapplestreaming/include/variantconnection.h

    r56 r58  
    2121#define _VARIANTCONNECTION_H 
    2222 
    23 #include "new/common.h" 
     23#include "common.h" 
    2424 
    2525class VariantConnection { 

  • trunk/sources/applications/admin/include/admin.h

    r56 r58  
    2222#define _ADMIN_H 
    2323 
    24 #include "new/common.h" 
     24#include "common.h" 
    2525 
    2626extern "C" DLLEXP BaseClientApplication *GetApplication(Variant configuration); 

  • trunk/sources/applications/applestreamingclient/include/applestreamingclient.h

    r56 r58  
    2222#define _APPLESTREAMINGCLIENT_H 
    2323 
    24 #include "new/common.h" 
     24#include "common.h" 
    2525 
    2626extern "C" DLLEXP BaseClientApplication *GetApplication(Variant configuration); 

  • trunk/sources/applications/applestreamingclient/include/eventsink/baseeventsink.h

    r56 r58  
    2222#define _BASEEVENTSINK_H 
    2323 
    24 #include "new/common.h" 
     24#include "common.h" 
    2525 
    2626#define EVENT_SYNC_RTMP         MAKE_TAG4('R','T','M','P') 

  • trunk/sources/applications/applestreamingclient/include/playlist.h

    r56 r58  
    2222#define _PLAYLIST_H 
    2323 
    24 #include "new/common.h" 
     24#include "common.h" 
    2525 
    2626class Playlist { 

  • trunk/sources/applications/applestreamingclient/include/speedcomputer.h

    r56 r58  
    2222#define _SPEEDCOMPUTER_H 
    2323 
    24 #include "new/common.h" 
     24#include "common.h" 
    2525 
    2626#define HLU_COUNT 1 

  • trunk/sources/applications/proxypublish/include/proxypublish.h

    r56 r58  
    2222#define _PROXYPUBLISH_H 
    2323 
    24 #include "new/common.h" 
     24#include "common.h" 
    2525 
    2626extern "C" DLLEXP BaseClientApplication *GetApplication(Variant configuration); 

  • trunk/sources/applications/samplefactory/include/controller.h

    r56 r58  
    2222#define _CONTROLLER_H 
    2323 
    24 #include "new/common.h" 
     24#include "common.h" 
    2525 
    2626class BaseProtocol; 

  • trunk/sources/applications/samplefactory/include/samplefactory.h

    r56 r58  
    2222#define _SAMPLEFACTORY_H 
    2323 
    24 #include "new/common.h" 
     24#include "common.h" 
    2525 
    2626extern "C" DLLEXP BaseClientApplication *GetApplication(Variant configuration); 

  • trunk/sources/applications/stresstest/include/stresstest.h

    r56 r58  
    2222#define _STRESSTEST_H 
    2323 
    24 #include "new/common.h" 
     24#include "common.h" 
    2525 
    2626extern "C" DLLEXP BaseClientApplication *GetApplication(Variant configuration); 

  • trunk/sources/applications/stresstest/src/stresstestapplication.cpp

    r56 r58  
    2020 
    2121 
    22 #include "new/common.h" 
     22#include "common.h" 
    2323#include "stresstestapplication.h" 
    2424#include "rtmpappprotocolhandler.h" 

  • trunk/sources/applications/vptests/include/vptests.h

    r56 r58  
    2222#define _VPTESTS_H 
    2323 
    24 #include "new/common.h" 
     24#include "common.h" 
    2525 
    2626extern "C" DLLEXP BaseClientApplication *GetApplication(Variant configuration); 

  • trunk/sources/common/include/common.h

    r56 r58  
    2121#define _COMMON_H 
    2222 
    23 #include "new/defines.h" 
    24 #include "new/platform/platform.h" 
    25 #include "new/utils/utils.h" 
     23#include "defines.h" 
     24#include "platform/platform.h" 
     25#include "utils/utils.h" 
    2626 
    2727#endif /* _COMMON_H */ 

  • trunk/sources/common/include/platform/android/androidplatform.h

    r56 r58  
    2323#define _ANDROIDPLATFORM_H 
    2424 
    25 #include "new/platform/baseplatform.h" 
     25#include "platform/baseplatform.h" 
    2626 
    2727//platform includes 

  • trunk/sources/common/include/platform/endianess/endianness.h

    r56 r58  
    2424//LITTLE ENDIAN SYSTEMS 
    2525#ifdef LITTLE_ENDIAN_BYTE_ALIGNED 
    26 #include "new/platform/endianess/little_endian_byte_aligned.h" 
     26#include "platform/endianess/little_endian_byte_aligned.h" 
    2727#endif 
    2828 
    2929#ifdef LITTLE_ENDIAN_SHORT_ALIGNED 
    30 #include "new/platform/endianess/little_endian_short_aligned.h" 
     30#include "platform/endianess/little_endian_short_aligned.h" 
    3131#endif 
    3232 
    3333#ifdef BIG_ENDIAN_BYTE_ALIGNED 
    34 #include "new/platform/endianess/big_endian_byte_aligned.h" 
     34#include "platform/endianess/big_endian_byte_aligned.h" 
    3535#endif 
    3636 
    3737#ifdef BIG_ENDIAN_SHORT_ALIGNED 
    38 #include "new/platform/endianess/big_endian_short_aligned.h" 
     38#include "platform/endianess/big_endian_short_aligned.h" 
    3939#endif 
    4040 

  • trunk/sources/common/include/platform/freebsd/freebsdplatform.h

    r56 r58  
    2222#define _FREEBSDPLATFORM_H 
    2323 
    24 #include "new/platform/baseplatform.h" 
     24#include "platform/baseplatform.h" 
    2525 
    2626//platform includes 

  • trunk/sources/common/include/platform/linux/linuxplatform.h

    r56 r58  
    2222#define _LINUXPLATFORM_H 
    2323 
    24 #include "new/platform/baseplatform.h" 
     24#include "platform/baseplatform.h" 
    2525 
    2626//platform includes 

  • trunk/sources/common/include/platform/osx/osxplatform.h

    r56 r58  
    2222#define _OSXPLATFORM_H 
    2323 
    24 #include "new/platform/baseplatform.h" 
     24#include "platform/baseplatform.h" 
    2525 
    2626//platform includes 

  • trunk/sources/common/include/platform/platform.h

    r56 r58  
    2121#define _PLATFORM_H 
    2222 
    23 #include "new/platform/endianess/endianness.h" 
     23#include "platform/endianess/endianness.h" 
    2424 
    2525#ifdef OSX 
    26 #include "new/platform/osx/osxplatform.h" 
     26#include "platform/osx/osxplatform.h" 
    2727#define Platform OSXPlatform 
    2828#endif /* OSX */ 
    2929 
    3030#ifdef LINUX 
    31 #include "new/platform/linux/max.h" 
    32 #include "new/platform/linux/linuxplatform.h" 
     31#include "platform/linux/max.h" 
     32#include "platform/linux/linuxplatform.h" 
    3333#define Platform LinuxPlatform 
    3434#endif /* LINUX */ 
    3535 
    3636#ifdef FREEBSD 
    37 #include "new/platform/freebsd/max.h" 
    38 #include "new/platform/freebsd/freebsdplatform.h" 
     37#include "platform/freebsd/max.h" 
     38#include "platform/freebsd/freebsdplatform.h" 
    3939#define Platform FreeBSDPlatform 
    4040#endif /* FREEBSD */ 
    4141 
    4242#ifdef SOLARIS 
    43 #include "new/platform/solaris/solarisplatform.h" 
     43#include "platform/solaris/solarisplatform.h" 
    4444#define Platform SolarisPlatform 
    4545#endif /* SOLARIS */ 
    … …  
    4848#include <WinSock2.h> 
    4949#include <Ws2tcpip.h> 
    50 #include "new/platform/windows/max.h" 
    51 #include "new/platform/windows/win32platform.h" 
     50#include "platform/windows/max.h" 
     51#include "platform/windows/win32platform.h" 
    5252#define Platform Win32Platform 
    5353#endif /* WIN32 */ 
    5454 
    5555#ifdef ANDROID 
    56 #include "new/platform/android/max.h" 
    57 #include "new/platform/android/androidplatform.h" 
     56#include "platform/android/max.h" 
     57#include "platform/android/androidplatform.h" 
    5858#define Platform AndroidPlatform 
    5959#endif /* ANDROID */ 

  • trunk/sources/common/include/platform/solaris/solarisplatform.h

    r56 r58  
    2222#define _SOLARISPLATFORM_H 
    2323 
    24 #include "new/platform/baseplatform.h" 
     24#include "platform/baseplatform.h" 
    2525 
    2626//platform includes 

  • trunk/sources/common/include/platform/windows/win32platform.h

    r56 r58  
    2222#define _WIN32PLATFORM_H 
    2323 
    24 #include "new/platform/baseplatform.h" 
     24#include "platform/baseplatform.h" 
    2525 
    2626#include <assert.h> 

  • trunk/sources/common/include/utils/buffering/bitarray.h

    r56 r58  
    2222#define _BITARRAY_H 
    2323 
    24 #include "new/utils/buffering/iobuffer.h" 
     24#include "utils/buffering/iobuffer.h" 
    2525 
    2626class BitArray 

  • trunk/sources/common/include/utils/buffering/buffering.h

    r56 r58  
    2121#define _BUFFERING_H 
    2222 
    23 #include "new/utils/buffering/iobuffer.h" 
    24 #include "new/utils/buffering/bitarray.h" 
    25 #include "new/utils/buffering/multiconsumerbuffer.h" 
     23#include "utils/buffering/iobuffer.h" 
     24#include "utils/buffering/bitarray.h" 
     25#include "utils/buffering/multiconsumerbuffer.h" 
    2626 
    2727#endif  /* _BUFFERING_H */ 

  • trunk/sources/common/include/utils/buffering/iobuffer.h

    r56 r58  
    2222#define _IOBUFFER_H 
    2323 
    24 #include "new/platform/platform.h" 
    25 #include "new/utils/misc/file.h" 
    26 #include "new/utils/misc/mmapfile.h" 
     24#include "platform/platform.h" 
     25#include "utils/misc/file.h" 
     26#include "utils/misc/mmapfile.h" 
    2727 
    2828#define GETAVAILABLEBYTESCOUNT(x)     ((x)._published - (x)._consumed) 

  • trunk/sources/common/include/utils/logging/baseloglocation.h

    r56 r58  
    2222#define BASELOGLOCATION_H_ 
    2323 
    24 #include "new/platform/platform.h" 
     24#include "platform/platform.h" 
    2525 
    2626class DLLEXP BaseLogLocation { 

  • trunk/sources/common/include/utils/logging/consoleloglocation.h

    r56 r58  
    2222#define CONSOLELOGLOCATION_H_ 
    2323 
    24 #include "new/utils/logging/baseloglocation.h" 
     24#include "utils/logging/baseloglocation.h" 
    2525 
    2626class DLLEXP ConsoleLogLocation 

  • trunk/sources/common/include/utils/logging/fileloglocation.h

    r56 r58  
    2222#define _FILELOGLOCATION_H 
    2323 
    24 #include "new/utils/logging/baseloglocation.h" 
     24#include "utils/logging/baseloglocation.h" 
    2525 
    2626class DLLEXP FileLogLocation 

  • trunk/sources/common/include/utils/logging/logcatloglocation.h

    r56 r58  
    2222#define _LOGCATLOGLOCATION_H 
    2323 
    24 #include "new/utils/logging/baseloglocation.h" 
     24#include "utils/logging/baseloglocation.h" 
    2525 
    2626class LogCatLogLocation 

  • trunk/sources/common/include/utils/logging/logger.h

    r56 r58  
    2222#define _LOGGER_H 
    2323 
    24 #include "new/platform/platform.h" 
     24#include "platform/platform.h" 
    2525#ifdef HAS_SAFE_LOGGER 
    2626#include <pthread.h> 

  • trunk/sources/common/include/utils/logging/logging.h

    r56 r58  
    2222#define _LOGGING_H 
    2323 
    24 #include "new/defines.h" 
    25 #include "new/utils/logging/baseloglocation.h" 
    26 #include "new/utils/logging/consoleloglocation.h" 
    27 #include "new/utils/logging/fileloglocation.h" 
    28 #include "new/utils/logging/logcatloglocation.h" 
    29 #include "new/utils/logging/logger.h" 
     24#include "defines.h" 
     25#include "utils/logging/baseloglocation.h" 
     26#include "utils/logging/consoleloglocation.h" 
     27#include "utils/logging/fileloglocation.h" 
     28#include "utils/logging/logcatloglocation.h" 
     29#include "utils/logging/logger.h" 
    3030 
    3131#define LOG(level,...) Logger::Log(level, __FILE__, __LINE__, __func__, __VA_ARGS__) 

  • trunk/sources/common/include/utils/lua/luautils.h

    r56 r58  
    2626#include <lauxlib.h> 
    2727} 
    28 #include "new/platform/platform.h" 
    29 #include "new/utils/misc/variant.h" 
     28#include "platform/platform.h" 
     29#include "utils/misc/variant.h" 
    3030 
    3131DLLEXP lua_State *CreateLuaState(); 

  • trunk/sources/common/include/utils/misc/crypto.h

    r56 r58  
    2222#define _CRYPTO_H 
    2323 
    24 #include "new/platform/platform.h" 
     24#include "platform/platform.h" 
    2525 
    2626class DLLEXP DHWrapper { 

  • trunk/sources/common/include/utils/misc/file.h

    r56 r58  
    2222#define _FILE_H 
    2323 
    24 #include "new/platform/platform.h" 
     24#include "platform/platform.h" 
    2525 
    2626class DLLEXP File { 

  • trunk/sources/common/include/utils/misc/misc.h

    r56 r58  
    2121#define _MISC_H 
    2222 
    23 #include "new/utils/misc/crypto.h" 
    24 #include "new/utils/misc/file.h" 
    25 #include "new/utils/misc/linkedlist.h" 
    26 #include "new/utils/misc/mmapfile.h" 
    27 #include "new/utils/misc/timersmanager.h" 
    28 #include "new/utils/misc/variant.h" 
     23#include "utils/misc/crypto.h" 
     24#include "utils/misc/file.h" 
     25#include "utils/misc/linkedlist.h" 
     26#include "utils/misc/mmapfile.h" 
     27#include "utils/misc/timersmanager.h" 
     28#include "utils/misc/variant.h" 
    2929 
    3030#endif  /* _MISC_H */ 

  • trunk/sources/common/include/utils/misc/mmapfile.h

    r56 r58  
    2323#define _MMAPFILE_H 
    2424 
    25 #include "new/platform/platform.h" 
     25#include "platform/platform.h" 
    2626 
    2727#ifdef HAS_MMAP 

  • trunk/sources/common/include/utils/misc/timersmanager.h

    r56 r58  
    2222#define _TIMERSMANAGER_H 
    2323 
    24 #include "new/platform/platform.h" 
     24#include "platform/platform.h" 
    2525 
    2626typedef struct _TimerEvent { 

  • trunk/sources/common/include/utils/misc/variant.h

    r56 r58  
    2222#define _VARIANT_H 
    2323 
    24 #include "new/defines.h" 
    25 #include "new/platform/platform.h" 
     24#include "defines.h" 
     25#include "platform/platform.h" 
    2626 
    2727//#define LOG_VARIANT_MEMORY_MANAGEMENT 

  • trunk/sources/common/include/utils/tinyxml/tinyxml.h

    r56 r58  
    2626#define TINYXML_INCLUDED 
    2727 
    28 #include "new/platform/platform.h" 
     28#include "platform/platform.h" 
    2929 
    3030#ifdef _MSC_VER 

  • trunk/sources/common/include/utils/utils.h

    r56 r58  
    2121#define _UTILS_H 
    2222 
    23 #include "new/utils/buffering/buffering.h" 
    24 #include "new/utils/logging/logging.h" 
    25 #include "new/utils/lua/luautils.h" 
    26 #include "new/utils/mempool/mempool.h" 
    27 #include "new/utils/misc/misc.h" 
     23#include "utils/buffering/buffering.h" 
     24#include "utils/logging/logging.h" 
     25#include "utils/lua/luautils.h" 
     26#include "utils/mempool/mempool.h" 
     27#include "utils/misc/misc.h" 
    2828 
    2929#endif /* _UTILS_H */ 

  • trunk/sources/common/src/platform/android/androidplatform.cpp

    r56 r58  
    2020#ifdef ANDROID 
    2121 
    22 #include "new/platform/android/androidplatform.h" 
    23 #include "new/platform/endianess/endianness.h" 
    24 #include "new/utils/logging/logging.h" 
     22#include "platform/android/androidplatform.h" 
     23#include "platform/endianess/endianness.h" 
     24#include "utils/logging/logging.h" 
    2525 
    2626string alowedCharacters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; 

  • trunk/sources/common/src/platform/android/timegm.cpp

    r56 r58  
    3333 
    3434#ifdef ANDROID 
    35 #include "new/platform/platform.h" 
     35#include "platform/platform.h" 
    3636 
    3737int is_leap(unsigned y) { 

  • trunk/sources/common/src/platform/baseplatform.cpp

    r56 r58  
    1919 
    2020 
    21 #include "new/platform/baseplatform.h" 
     21#include "platform/baseplatform.h" 
    2222 
    2323BasePlatform::BasePlatform() { 

  • trunk/sources/common/src/platform/freebsd/freebsdplatform.cpp

    r56 r58  
    1919 
    2020#ifdef FREEBSD 
    21 #include "new/platform/freebsd/freebsdplatform.h" 
     21#include "platform/freebsd/freebsdplatform.h" 
    2222 
    2323string alowedCharacters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; 

  • trunk/sources/common/src/platform/linux/linuxplatform.cpp

    r56 r58  
    2020#ifdef LINUX 
    2121 
    22 #include "new/platform/linux/linuxplatform.h" 
     22#include "platform/linux/linuxplatform.h" 
    2323 
    2424string alowedCharacters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; 

  • trunk/sources/common/src/platform/osx/osxplatform.cpp

    r56 r58  
    1919 
    2020#ifdef OSX 
    21 #include "new/platform/osx/osxplatform.h" 
     21#include "platform/osx/osxplatform.h" 
    2222 
    2323string alowedCharacters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; 

  • trunk/sources/common/src/platform/solaris/solarisplatform.cpp

    r56 r58  
    2020#ifdef SOLARIS 
    2121 
    22 #include "new/platform/solaris/solarisplatform.h" 
    23 #include "new/platform/endianess/endianness.h" 
    24 #include "new/utils/logging/logging.h" 
     22#include "platform/solaris/solarisplatform.h" 
     23#include "platform/endianess/endianness.h" 
     24#include "utils/logging/logging.h" 
    2525 
    2626string alowedCharacters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; 

  • trunk/sources/common/src/platform/solaris/timegm.cpp

    r56 r58  
    3333 
    3434#ifdef SOLARIS 
    35 #include "new/platform/platform.h" 
     35#include "platform/platform.h" 
    3636 
    3737int is_leap(unsigned y) { 

  • trunk/sources/common/src/platform/windows/strptime.cpp

    r56 r58  
    11/* 
    2  * Copyright (c) 1999 Kungliga Tekniska Högskolan 
     2 * Copyright (c) 1999 Kungliga Tekniska Hï¿œgskolan 
    33 * (Royal Institute of Technology, Stockholm, Sweden).  
    44 * All rights reserved.  
    … …  
    3333#ifdef WIN32 
    3434 
    35 #include "new/platform/platform.h" 
     35#include "platform/platform.h" 
    3636 
    3737 

  • trunk/sources/common/src/platform/windows/timegm.cpp

    r56 r58  
    11/* 
    2  * Copyright (c) 1997 Kungliga Tekniska Högskolan 
     2 * Copyright (c) 1997 Kungliga Tekniska Hï¿œgskolan 
    33 * (Royal Institute of Technology, Stockholm, Sweden).  
    44 * All rights reserved.  
    … …  
    3333 
    3434#ifdef WIN32 
    35 #include "new/platform/platform.h" 
     35#include "platform/platform.h" 
    3636 
    3737static int 

  • trunk/sources/common/src/platform/windows/win32platform.cpp

    r56 r58  
    2020#ifdef WIN32 
    2121 
    22 #include "new/platform/platform.h" 
    23 #include "new/utils/logging/logging.h" 
     22#include "platform/platform.h" 
     23#include "utils/logging/logging.h" 
    2424#include <Strsafe.h> 
    2525#include <stdio.h> 

  • trunk/sources/common/src/utils/buffering/iobuffer.cpp

    r56 r58  
    1919 
    2020 
    21 #include "new/utils/buffering/iobuffer.h" 
    22 #include "new/utils/logging/logging.h" 
     21#include "utils/buffering/iobuffer.h" 
     22#include "utils/logging/logging.h" 
    2323 
    2424#ifdef WITH_SANITY_INPUT_BUFFER 

  • trunk/sources/common/src/utils/logging/baseloglocation.cpp

    r56 r58  
    1919 
    2020 
    21 #include "new/utils/logging/baseloglocation.h" 
     21#include "utils/logging/baseloglocation.h" 
    2222 
    2323BaseLogLocation::BaseLogLocation() { 

  • trunk/sources/common/src/utils/logging/consoleloglocation.cpp

    r56 r58  
    1919 
    2020 
    21 #include "new/utils/logging/consoleloglocation.h" 
     21#include "utils/logging/consoleloglocation.h" 
    2222 
    2323vector<COLOR_TYPE> ConsoleLogLocation::_colors; 

  • trunk/sources/common/src/utils/logging/fileloglocation.cpp

    r56 r58  
    1919 
    2020 
    21 #include "new/utils/logging/fileloglocation.h" 
     21#include "utils/logging/fileloglocation.h" 
    2222 
    2323FileLogLocation::FileLogLocation(string path, bool append) 

  • trunk/sources/common/src/utils/logging/logcatloglocation.cpp

    r56 r58  
    1919 
    2020#ifdef ANDROID 
    21 #include "new/utils/logging/logcatloglocation.h" 
     21#include "utils/logging/logcatloglocation.h" 
    2222#include <android/log.h> 
    2323 

  • trunk/sources/common/src/utils/logging/logger.cpp

    r56 r58  
    1919 
    2020 
    21 #include "new/utils/logging/logger.h" 
    22 #include "new/utils/logging/baseloglocation.h" 
     21#include "utils/logging/logger.h" 
     22#include "utils/logging/baseloglocation.h" 
    2323 
    2424Logger *Logger::_pLogger = NULL; 

  • trunk/sources/common/src/utils/lua/luautils.cpp

    r56 r58  
    2020 
    2121#ifdef HAS_LUA 
    22 #include "new/utils/lua/luautils.h" 
    23 #include "new/utils/logging/logging.h" 
     22#include "utils/lua/luautils.h" 
     23#include "utils/logging/logging.h" 
    2424 
    2525void * _lua_alloc(void *ud, void *ptr, size_t osize, size_t nsize) { 

  • trunk/sources/common/src/utils/misc/crypto.cpp

    r56 r58  
    1919 
    2020 
    21 #include "new/utils/misc/crypto.h" 
    22 #include "new/utils/misc/dhgroups.h" 
    23 #include "new/utils/logging/logging.h" 
     21#include "utils/misc/crypto.h" 
     22#include "utils/misc/dhgroups.h" 
     23#include "utils/logging/logging.h" 
    2424 
    2525DHWrapper::DHWrapper(int32_t bitsCount) { 

  • trunk/sources/common/src/utils/misc/file.cpp

    r56 r58  
    2020 
    2121 
    22 #include "new/utils/buffering/iobuffer.h" 
    23 #include "new/utils/logging/logging.h" 
     22#include "utils/buffering/iobuffer.h" 
     23#include "utils/logging/logging.h" 
    2424 
    2525File::File() { 

  • trunk/sources/common/src/utils/misc/mmapfile.cpp

    r56 r58  
    1818 */ 
    1919 
    20 #include "new/utils/misc/mmapfile.h" 
    21 #include "new/utils/logging/logging.h" 
     20#include "utils/misc/mmapfile.h" 
     21#include "utils/logging/logging.h" 
    2222 
    2323#ifdef HAS_MMAP 

  • trunk/sources/common/src/utils/misc/timersmanager.cpp

    r56 r58  
    1919 
    2020 
    21 #include "new/utils/misc/timersmanager.h" 
    22 #include "new/utils/logging/logging.h" 
     21#include "utils/misc/timersmanager.h" 
     22#include "utils/logging/logging.h" 
    2323 
    2424TimersManager::TimersManager(ProcessTimerEvent processTimerEvent) { 

  • trunk/sources/common/src/utils/misc/variant.cpp

    r56 r58  
    1919 
    2020 
    21 #include "new/defines.h" 
    22 #include "new/utils/misc/variant.h" 
    23 #include "new/utils/misc/variantmap.h" 
    24 #include "new/utils/logging/logging.h" 
    25 #include "new/utils/tinyxml/tinyxml.h" 
    26 #include "new/utils/misc/file.h" 
    27 #include "new/utils/misc/crypto.h" 
     21#include "defines.h" 
     22#include "utils/misc/variant.h" 
     23#include "utils/misc/variantmap.h" 
     24#include "utils/logging/logging.h" 
     25#include "utils/tinyxml/tinyxml.h" 
     26#include "utils/misc/file.h" 
     27#include "utils/misc/crypto.h" 
    2828 
    2929#ifdef LOG_VARIANT_MEMORY_MANAGEMENT 

  • trunk/sources/common/src/utils/tinyxml/tinyxml.cpp

    r56 r58  
    2323 */ 
    2424 
    25 #include "new/utils/tinyxml/tinyxml.h" 
     25#include "utils/tinyxml/tinyxml.h" 
    2626 
    2727bool TiXmlBase::condenseWhiteSpace = true; 

  • trunk/sources/common/src/utils/tinyxml/tinyxmlerror.cpp

    r56 r58  
    2323*/ 
    2424 
    25 #include "new/utils/tinyxml/tinyxml.h" 
     25#include "utils/tinyxml/tinyxml.h" 
    2626 
    2727// The goal of the seperate error file is to make the first 

  • trunk/sources/common/src/utils/tinyxml/tinyxmlparser.cpp

    r56 r58  
    2323 */ 
    2424 
    25 #include "new/utils/tinyxml/tinyxml.h" 
     25#include "utils/tinyxml/tinyxml.h" 
    2626 
    2727//#define DEBUG_PARSER 

  • trunk/sources/tests/include/commontestssuite.h

    r56 r58  
    2222#define __COMMONTESTSSUITE_H 
    2323 
    24 #include "new/common.h" 
     24#include "common.h" 
    2525#include "basetestssuite.h" 
    2626 

  • trunk/sources/tests/include/thelibtestssuite.h

    r56 r58  
    2222#define _THELIBTESTSSUITE_H 
    2323 
    24 #include "new/common.h" 
     24#include "common.h" 
    2525#include "basetestssuite.h" 
    2626 

  • trunk/sources/tests/include/varianttestssuite.h

    r56 r58  
    2323#define __VARIANTTESTSSUITE_H 
    2424 
    25 #include "new/common.h" 
     25#include "common.h" 
    2626#include "basetestssuite.h" 
    2727 

  • trunk/sources/tests/src/varianttestssuite.cpp

    r56 r58  
    2020 
    2121#include "varianttestssuite.h" 
    22 #include "new/common.h" 
     22#include "common.h" 
    2323 
    2424#define di64_1 ((int64_t) (0x8000000000000000LL)) 

  • trunk/sources/thelib/include/application/baseappprotocolhandler.h

    r56 r58  
    2222#define _BASEAPPPROTOCOLHANDLER_H 
    2323 
    24 #include "new/common.h" 
     24#include "common.h" 
    2525 
    2626class BaseClientApplication; 

  • trunk/sources/thelib/include/application/baseclientapplication.h

    r56 r58  
    2222#define _BASECLIENTAPPLICATION_H 
    2323 
    24 #include "new/common.h" 
     24#include "common.h" 
    2525#include "streaming/streamsmanager.h" 
    2626 

  • trunk/sources/thelib/include/application/clientapplicationmanager.h

    r56 r58  
    2323 
    2424 
    25 #include "new/common.h" 
     25#include "common.h" 
    2626#include "application/baseclientapplication.h" 
    2727 

  • trunk/sources/thelib/include/configuration/configfile.h

    r56 r58  
    2222#define _CONFIGFILE_H 
    2323 
    24 #include "new/common.h" 
     24#include "common.h" 
    2525 
    2626class Logger; 

  • trunk/sources/thelib/include/mediaformats/basemediadocument.h

    r56 r58  
    2222 
    2323 
    24 #include "new/common.h" 
     24#include "common.h" 
    2525#include "mediaformats/mediaframe.h" 
    2626 

  • trunk/sources/thelib/include/mediaformats/flv/flvdocument.h

    r56 r58  
    2222#define _FLVDOCUMENT 
    2323 
    24 #include "new/common.h" 
     24#include "common.h" 
    2525#include "mediaformats/basemediadocument.h" 
    2626 

  • trunk/sources/thelib/include/mediaformats/mediaframe.h

    r56 r58  
    2121#define _MEDIAFRAME_H 
    2222 
    23 #include "new/common.h" 
     23#include "common.h" 
    2424 
    2525#define MEDIAFRAME_TYPE_AUDIO 0 

  • trunk/sources/thelib/include/mediaformats/mp3/id3parser.h

    r56 r58  
    2222#define _ID3PARSER_H 
    2323 
    24 #include "new/common.h" 
     24#include "common.h" 
    2525 
    2626class ID3Parser { 

  • trunk/sources/thelib/include/mediaformats/mp4/baseatom.h