Changeset 73

Timestamp:

08/12/10 16:39:36 (18 months ago)

Author:

shiretu

Message:

-- moving stuff around

Location:

trunk

Files:

• builders/netbeans/osx/common/nbproject/Makefile-Debug.mk (modified) (2 diffs)
• builders/netbeans/osx/common/nbproject/Makefile-Release.mk (modified) (2 diffs)
• sources/win32service (added)
• sources/win32service/svcconfig (moved) (moved from trunk/sources/applications/SvcConfig)
• sources/win32service/svcconfig/src/SvcConfig.cpp (deleted)
• sources/win32service/svcconfig/src/svcconfig.cpp (copied) (copied from trunk/sources/applications/SvcConfig/src/SvcConfig.cpp)
• sources/win32service/svccontrol (moved) (moved from trunk/sources/applications/SvcControl)
• sources/win32service/svccontrol/src/SvcControl.cpp (deleted)
• sources/win32service/svccontrol/src/svccontrol.cpp (copied) (copied from trunk/sources/applications/SvcControl/src/SvcControl.cpp)
• sources/win32service/win32service (moved) (moved from trunk/sources/applications/win32service)
• sources/win32service/win32service/Readme.txt (deleted)
• sources/win32service/win32service/include/svc/Svc.h (deleted)
• sources/win32service/win32service/include/svc/svc.h (copied) (copied from trunk/sources/applications/win32service/include/svc/Svc.h)
• sources/win32service/win32service/readme.txt (copied) (copied from trunk/sources/applications/win32service/Readme.txt)
• sources/win32service/win32service/src/svc/Svc.cpp (deleted)
• sources/win32service/win32service/src/svc/Svc2.cpp (deleted)
• sources/win32service/win32service/src/svc/svc.cpp (copied) (copied from trunk/sources/applications/win32service/src/svc/Svc.cpp)
• sources/win32service/win32service/src/svc/svc2.cpp (copied) (copied from trunk/sources/applications/win32service/src/svc/Svc2.cpp)

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

@@ -38 +38 @@
         ${OBJECTDIR}/_ext/674965218/variant.o \
         ${OBJECTDIR}/_ext/1980509653/timegm.o \
+        ${OBJECTDIR}/_ext/1874657879/baseloglocation.o \
         ${OBJECTDIR}/_ext/1874657879/fileloglocation.o \
-        ${OBJECTDIR}/_ext/1874657879/baseloglocation.o \
         ${OBJECTDIR}/_ext/113024148/iobuffer.o \
         ${OBJECTDIR}/_ext/230374975/strptime.o \
@@ -109 +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
 
+${OBJECTDIR}/_ext/1874657879/baseloglocation.o: ../../../../sources/common/src/utils/logging/baseloglocation.cpp 
+        ${MKDIR} -p ${OBJECTDIR}/_ext/1874657879
+        ${RM} $@.d
+        $(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
+
 ${OBJECTDIR}/_ext/1874657879/fileloglocation.o: ../../../../sources/common/src/utils/logging/fileloglocation.cpp 
         ${MKDIR} -p ${OBJECTDIR}/_ext/1874657879
         ${RM} $@.d
         $(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
-
-${OBJECTDIR}/_ext/1874657879/baseloglocation.o: ../../../../sources/common/src/utils/logging/baseloglocation.cpp 
-        ${MKDIR} -p ${OBJECTDIR}/_ext/1874657879
-        ${RM} $@.d
-        $(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
 
 ${OBJECTDIR}/_ext/113024148/iobuffer.o: ../../../../sources/common/src/utils/buffering/iobuffer.cpp 

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

@@ -38 +38 @@
         ${OBJECTDIR}/_ext/674965218/variant.o \
         ${OBJECTDIR}/_ext/1980509653/timegm.o \
+        ${OBJECTDIR}/_ext/1874657879/baseloglocation.o \
         ${OBJECTDIR}/_ext/1874657879/fileloglocation.o \
-        ${OBJECTDIR}/_ext/1874657879/baseloglocation.o \
         ${OBJECTDIR}/_ext/113024148/iobuffer.o \
         ${OBJECTDIR}/_ext/230374975/strptime.o \
@@ -109 +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
 
+${OBJECTDIR}/_ext/1874657879/baseloglocation.o: ../../../../sources/common/src/utils/logging/baseloglocation.cpp 
+        ${MKDIR} -p ${OBJECTDIR}/_ext/1874657879
+        ${RM} $@.d
+        $(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
+
 ${OBJECTDIR}/_ext/1874657879/fileloglocation.o: ../../../../sources/common/src/utils/logging/fileloglocation.cpp 
         ${MKDIR} -p ${OBJECTDIR}/_ext/1874657879
         ${RM} $@.d
         $(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
-
-${OBJECTDIR}/_ext/1874657879/baseloglocation.o: ../../../../sources/common/src/utils/logging/baseloglocation.cpp 
-        ${MKDIR} -p ${OBJECTDIR}/_ext/1874657879
-        ${RM} $@.d
-        $(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
 
 ${OBJECTDIR}/_ext/113024148/iobuffer.o: ../../../../sources/common/src/utils/buffering/iobuffer.cpp