summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Burnicki <martin.burnicki@meinberg.de>2009-01-21 12:33:04 +0100
committerMartin Burnicki <martin.burnicki@meinberg.de>2009-01-21 12:33:04 +0100
commit9b7c44e15052fde65e6f21ec3c5044ef88368ec2 (patch)
treec40b32ee6307266c1599cd5cc4ae6bb0cd1560e4
parent27fbb6b9322f93e8c2c99d6f22329cd337fd655f (diff)
downloadmbgsdk-win-9b7c44e15052fde65e6f21ec3c5044ef88368ec2.tar.gz
mbgsdk-win-9b7c44e15052fde65e6f21ec3c5044ef88368ec2.zip
Update xhrtime.c and associated VC6 project files
-rw-r--r--c/demo/mbgdevio/vc6/mbgdevio.dsw24
-rw-r--r--c/demo/mbgdevio/vc6/xhrtime.dsp40
-rw-r--r--c/demo/mbgdevio/xhrtime.c3
3 files changed, 50 insertions, 17 deletions
diff --git a/c/demo/mbgdevio/vc6/mbgdevio.dsw b/c/demo/mbgdevio/vc6/mbgdevio.dsw
index a862826..8471c86 100644
--- a/c/demo/mbgdevio/vc6/mbgdevio.dsw
+++ b/c/demo/mbgdevio/vc6/mbgdevio.dsw
@@ -3,6 +3,30 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
###############################################################################
+Project: "hrtime"=.\hrtime.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "mbgdevio_demo"=.\mbgdevio_demo.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Project: "xhrtime"=.\xhrtime.dsp - Package Owner=<4>
Package=<5>
diff --git a/c/demo/mbgdevio/vc6/xhrtime.dsp b/c/demo/mbgdevio/vc6/xhrtime.dsp
index 84f9582..9cf2fd6 100644
--- a/c/demo/mbgdevio/vc6/xhrtime.dsp
+++ b/c/demo/mbgdevio/vc6/xhrtime.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\mbglib\include" /I "..\..\mbglib\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\mbglib\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
# ADD BASE RSC /l 0x407 /d "NDEBUG"
# ADD RSC /l 0x407 /d "NDEBUG"
BSC32=bscmake.exe
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mbgdevio.lib mbgutil.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\mbglib\lib" /libpath:"..\..\mbglib\lib\msc"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "xhrtime - Win32 Debug"
@@ -66,7 +66,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\mbglib\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\mbglib\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD BASE RSC /l 0x407 /d "_DEBUG"
# ADD RSC /l 0x407 /d "_DEBUG"
BSC32=bscmake.exe
@@ -74,7 +74,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 mbgdevio.lib mbgutil.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\mbglib\lib\msc"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
!ENDIF
@@ -95,56 +95,64 @@ SOURCE=..\xhrtime.c
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
-SOURCE=..\..\mbglib\include\gpsdefs.h
+SOURCE=..\..\..\mbglib\include\gpsdefs.h
# End Source File
# Begin Source File
-SOURCE=..\..\mbglib\include\mbg_tgt.h
+SOURCE=..\..\..\mbglib\include\mbg_tgt.h
# End Source File
# Begin Source File
-SOURCE=..\..\mbglib\include\mbgdevio.h
+SOURCE=..\..\..\mbglib\include\mbgdevio.h
# End Source File
# Begin Source File
-SOURCE=..\..\mbglib\include\mbgerror.h
+SOURCE=..\..\..\mbglib\include\mbgerror.h
# End Source File
# Begin Source File
-SOURCE=..\..\mbglib\include\mbggeo.h
+SOURCE=..\..\..\mbglib\include\mbggeo.h
# End Source File
# Begin Source File
-SOURCE=..\..\mbglib\include\mbgutil.h
+SOURCE=..\..\..\mbglib\include\mbgutil.h
# End Source File
# Begin Source File
-SOURCE=..\..\mbglib\include\pci_asic.h
+SOURCE=..\..\..\mbglib\include\pci_asic.h
# End Source File
# Begin Source File
-SOURCE=..\..\mbglib\include\pcpsdefs.h
+SOURCE=..\..\..\mbglib\include\pcpsdefs.h
# End Source File
# Begin Source File
-SOURCE=..\..\mbglib\include\pcpsdev.h
+SOURCE=..\..\..\mbglib\include\pcpsdev.h
# End Source File
# Begin Source File
-SOURCE=..\..\mbglib\include\usbdefs.h
+SOURCE=..\..\..\mbglib\include\usbdefs.h
# End Source File
# Begin Source File
-SOURCE=..\..\mbglib\include\use_pack.h
+SOURCE=..\..\..\mbglib\include\use_pack.h
# End Source File
# Begin Source File
-SOURCE=..\..\mbglib\include\words.h
+SOURCE=..\..\..\mbglib\include\words.h
# End Source File
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
+# Begin Source File
+
+SOURCE=..\..\..\mbglib\lib\msc\mbgutil.lib
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\mbglib\lib\msc\mbgdevio.lib
+# End Source File
# End Target
# End Project
diff --git a/c/demo/mbgdevio/xhrtime.c b/c/demo/mbgdevio/xhrtime.c
index 291785e..89d64e8 100644
--- a/c/demo/mbgdevio/xhrtime.c
+++ b/c/demo/mbgdevio/xhrtime.c
@@ -1,6 +1,6 @@
/**************************************************************************
*
- * $Id: xhrtime.c 1.1 2009/01/07 15:21:48Z daniel TRASH daniel $
+ * $Id: xhrtime.c 1.2 2009/01/15 15:59:09Z daniel TRASH $
*
* Description:
* Main file for mbgxhrtime program which demonstrates how to retrieve
@@ -33,6 +33,7 @@
*
* -----------------------------------------------------------------------
* $Log: xhrtime.c $
+ * Revision 1.2 2009/01/15 15:59:09Z daniel
* Revision 1.1 2009/01/07 15:21:48Z daniel
* Initial revision
*