From 6b37f147c28299aab6f0e385ca82b749f75ca689 Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Tue, 8 Nov 2005 11:55:27 +0000 Subject: MSVC projects for pjlib-util git-svn-id: http://svn.pjsip.org/repos/pjproject/main@33 74dad513-b988-da41-8d7b-12977e46ad98 --- build/common.mak | 54 ++++++++++++++ pjlib-util/build/Makefile | 54 +------------- pjlib-util/build/pjlib_util.dsp | 136 +++++++++++++++++++++++++++++++++++ pjlib-util/build/pjlib_util.dsw | 75 +++++++++++++++++++ pjlib-util/build/pjlib_util_test.dsp | 114 +++++++++++++++++++++++++++++ pjlib-util/include/pjlib-util.h | 4 ++ pjlib-util/src/pjlib-util/symbols.c | 65 +++++++++++++++++ pjlib/build/Makefile | 54 +------------- 8 files changed, 450 insertions(+), 106 deletions(-) create mode 100644 build/common.mak create mode 100644 pjlib-util/build/pjlib_util.dsp create mode 100644 pjlib-util/build/pjlib_util.dsw create mode 100644 pjlib-util/build/pjlib_util_test.dsp create mode 100644 pjlib-util/include/pjlib-util.h create mode 100644 pjlib-util/src/pjlib-util/symbols.c diff --git a/build/common.mak b/build/common.mak new file mode 100644 index 00000000..608390cb --- /dev/null +++ b/build/common.mak @@ -0,0 +1,54 @@ +# +# Include host/target/compiler selection. +# This will export CC_NAME, MACHINE_NAME, OS_NAME, and HOST_NAME variables. +# +include ../../build.mak + +# +# Include global compiler specific definitions +# +include ../../build/cc-$(CC_NAME).mak + +# +# (Optionally) Include compiler specific configuration that is +# specific to this project. This configuration file is +# located in this directory. +# +-include cc-$(CC_NAME).mak + +# +# Include global machine specific definitions +# +include ../../build/m-$(MACHINE_NAME).mak +-include m-$(MACHINE_NAME).mak + +# +# Include target OS specific definitions +# +include ../../build/os-$(OS_NAME).mak + +# +# (Optionally) Include target OS specific configuration that is +# specific to this project. This configuration file is +# located in this directory. +# +-include os-$(OS_NAME).mak + +# +# Include host specific definitions +# +include ../../build/host-$(HOST_NAME).mak + +# +# (Optionally) Include host specific configuration that is +# specific to this project. This configuration file is +# located in this directory. +# +-include host-$(HOST_NAME).mak + +# +# Include global user configuration, if any +# +-include ../../user.mak + + diff --git a/pjlib-util/build/Makefile b/pjlib-util/build/Makefile index a309b5ca..c9bdc24b 100644 --- a/pjlib-util/build/Makefile +++ b/pjlib-util/build/Makefile @@ -1,56 +1,4 @@ -# -# Include host/target/compiler selection. -# This will export CC_NAME, MACHINE_NAME, OS_NAME, and HOST_NAME variables. -# -include ../../build.mak - -# -# Include global compiler specific definitions -# -include ../../build/cc-$(CC_NAME).mak - -# -# (Optionally) Include compiler specific configuration that is -# specific to this project. This configuration file is -# located in this directory. -# --include cc-$(CC_NAME).mak - -# -# Include global machine specific definitions -# -include ../../build/m-$(MACHINE_NAME).mak --include m-$(MACHINE_NAME).mak - -# -# Include target OS specific definitions -# -include ../../build/os-$(OS_NAME).mak - -# -# (Optionally) Include target OS specific configuration that is -# specific to this project. This configuration file is -# located in this directory. -# --include os-$(OS_NAME).mak - -# -# Include host specific definitions -# -include ../../build/host-$(HOST_NAME).mak - -# -# (Optionally) Include host specific configuration that is -# specific to this project. This configuration file is -# located in this directory. -# --include host-$(HOST_NAME).mak - -# -# Include global user configuration, if any -# --include ../../user.mak - +include ../../build/common.mak RULES_MAK := ../../build/rules.mak diff --git a/pjlib-util/build/pjlib_util.dsp b/pjlib-util/build/pjlib_util.dsp new file mode 100644 index 00000000..599294df --- /dev/null +++ b/pjlib-util/build/pjlib_util.dsp @@ -0,0 +1,136 @@ +# Microsoft Developer Studio Project File - Name="pjlib_util" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=pjlib_util - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "pjlib_util.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "pjlib_util.mak" CFG="pjlib_util - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "pjlib_util - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "pjlib_util - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "pjlib_util - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "./output/pjlib-util-i386-win32-vc6-release" +# PROP BASE Intermediate_Dir "./output/pjlib-util-i386-win32-vc6-release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "./output/pjlib-util-i386-win32-vc6-release" +# PROP Intermediate_Dir "./output/pjlib-util-i386-win32-vc6-release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "../include" /I "../../pjlib/include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"../lib/pjlib-util-i386-win32-vc6-release.lib" + +!ELSEIF "$(CFG)" == "pjlib_util - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "./output/pjlib-util-i386-win32-vc6-debug" +# PROP BASE Intermediate_Dir "./output/pjlib-util-i386-win32-vc6-debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "./output/pjlib-util-i386-win32-vc6-debug" +# PROP Intermediate_Dir "./output/pjlib-util-i386-win32-vc6-debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib/include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"../lib/pjlib-util-i386-win32-vc6-debug.lib" + +!ENDIF + +# Begin Target + +# Name "pjlib_util - Win32 Release" +# Name "pjlib_util - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE="..\src\pjlib-util\md5.c" +# End Source File +# Begin Source File + +SOURCE="..\src\pjlib-util\scanner.c" +# End Source File +# Begin Source File + +SOURCE="..\src\pjlib-util\stun.c" +# End Source File +# Begin Source File + +SOURCE="..\src\pjlib-util\stun_client.c" +# End Source File +# Begin Source File + +SOURCE="..\src\pjlib-util\symbols.c" +# End Source File +# Begin Source File + +SOURCE="..\src\pjlib-util\xml.c" +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE="..\include\pjlib-util\md5.h" +# End Source File +# Begin Source File + +SOURCE="..\include\pjlib-util.h" +# End Source File +# Begin Source File + +SOURCE="..\include\pjlib-util\scanner.h" +# End Source File +# Begin Source File + +SOURCE="..\include\pjlib-util\stun.h" +# End Source File +# Begin Source File + +SOURCE="..\include\pjlib-util\xml.h" +# End Source File +# End Group +# End Target +# End Project diff --git a/pjlib-util/build/pjlib_util.dsw b/pjlib-util/build/pjlib_util.dsw new file mode 100644 index 00000000..b2bcb1a0 --- /dev/null +++ b/pjlib-util/build/pjlib_util.dsw @@ -0,0 +1,75 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "pjlib"="..\..\pjlib\build\pjlib.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "pjlib_test"="..\..\pjlib\build\pjlib_test.dsp" - Package Owner=<4> + +Package=<5> +{{{ + begin source code control + "$/pjproject/pjlib/build", UIAAAAAA + ..\..\pjlib\build + end source code control +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "pjlib_util"=".\pjlib_util.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "pjlib_util_test"=".\pjlib_util_test.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name pjlib_util + End Project Dependency + Begin Project Dependency + Project_Dep_Name pjlib + End Project Dependency +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/pjlib-util/build/pjlib_util_test.dsp b/pjlib-util/build/pjlib_util_test.dsp new file mode 100644 index 00000000..5b6b349d --- /dev/null +++ b/pjlib-util/build/pjlib_util_test.dsp @@ -0,0 +1,114 @@ +# Microsoft Developer Studio Project File - Name="pjlib_util_test" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=pjlib_util_test - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "pjlib_util_test.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "pjlib_util_test.mak" CFG="pjlib_util_test - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "pjlib_util_test - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "pjlib_util_test - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "pjlib_util_test - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "./output/pjlib-util-test-i386-win32-vc6-release" +# PROP BASE Intermediate_Dir "./output/pjlib-util-test-i386-win32-vc6-release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "./output/pjlib-util-test-i386-win32-vc6-release" +# PROP Intermediate_Dir "./output/pjlib-util-test-i386-win32-vc6-release" +# 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 /MD /W3 /GX /O2 /I "../include" /I "../../pjlib/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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 netapi32.lib mswsock.lib ws2_32.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 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 /out:"../bin/pjlib-util-test-i386-win32-vc6-release" + +!ELSEIF "$(CFG)" == "pjlib_util_test - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "./output/pjlib-util-test-i386-win32-vc6-debug" +# PROP BASE Intermediate_Dir "./output/pjlib-util-test-i386-win32-vc6-debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "./output/pjlib-util-test-i386-win32-vc6-debug" +# PROP Intermediate_Dir "./output/pjlib-util-test-i386-win32-vc6-debug" +# 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 /MTd /W3 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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 netapi32.lib mswsock.lib ws2_32.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 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 /out:"../bin/pjlib-util-test-i386-win32-vc6-debug" /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "pjlib_util_test - Win32 Release" +# Name "pjlib_util_test - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE="..\src\pjlib-util-test\main.c" +# End Source File +# Begin Source File + +SOURCE="..\src\pjlib-util-test\test.c" +# End Source File +# Begin Source File + +SOURCE="..\src\pjlib-util-test\xml.c" +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE="..\src\pjlib-util-test\test.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 +# End Target +# End Project diff --git a/pjlib-util/include/pjlib-util.h b/pjlib-util/include/pjlib-util.h new file mode 100644 index 00000000..69989ca0 --- /dev/null +++ b/pjlib-util/include/pjlib-util.h @@ -0,0 +1,4 @@ +#include +#include +#include +#include diff --git a/pjlib-util/src/pjlib-util/symbols.c b/pjlib-util/src/pjlib-util/symbols.c new file mode 100644 index 00000000..adf72190 --- /dev/null +++ b/pjlib-util/src/pjlib-util/symbols.c @@ -0,0 +1,65 @@ +/* $Id$ */ +#include +#include + +/* + * md5.h + */ +PJ_EXPORT_SYMBOL(md5_init) +PJ_EXPORT_SYMBOL(md5_append) +PJ_EXPORT_SYMBOL(md5_finish) + +/* + * scanner.h + */ +PJ_EXPORT_SYMBOL(pj_cs_init) +PJ_EXPORT_SYMBOL(pj_cs_set) +PJ_EXPORT_SYMBOL(pj_cs_add_range) +PJ_EXPORT_SYMBOL(pj_cs_add_alpha) +PJ_EXPORT_SYMBOL(pj_cs_add_num) +PJ_EXPORT_SYMBOL(pj_cs_add_str) +PJ_EXPORT_SYMBOL(pj_cs_del_range) +PJ_EXPORT_SYMBOL(pj_cs_del_str) +PJ_EXPORT_SYMBOL(pj_cs_invert) +PJ_EXPORT_SYMBOL(pj_scan_init) +PJ_EXPORT_SYMBOL(pj_scan_fini) +PJ_EXPORT_SYMBOL(pj_scan_peek) +PJ_EXPORT_SYMBOL(pj_scan_peek_n) +PJ_EXPORT_SYMBOL(pj_scan_peek_until) +PJ_EXPORT_SYMBOL(pj_scan_get) +PJ_EXPORT_SYMBOL(pj_scan_get_quote) +PJ_EXPORT_SYMBOL(pj_scan_get_n) +PJ_EXPORT_SYMBOL(pj_scan_get_char) +PJ_EXPORT_SYMBOL(pj_scan_get_newline) +PJ_EXPORT_SYMBOL(pj_scan_get_until) +PJ_EXPORT_SYMBOL(pj_scan_get_until_ch) +PJ_EXPORT_SYMBOL(pj_scan_get_until_chr) +PJ_EXPORT_SYMBOL(pj_scan_advance_n) +PJ_EXPORT_SYMBOL(pj_scan_strcmp) +PJ_EXPORT_SYMBOL(pj_scan_stricmp) +PJ_EXPORT_SYMBOL(pj_scan_skip_whitespace) +PJ_EXPORT_SYMBOL(pj_scan_save_state) +PJ_EXPORT_SYMBOL(pj_scan_restore_state) + +/* + * stun.h + */ +PJ_EXPORT_SYMBOL(pj_stun_create_bind_req) +PJ_EXPORT_SYMBOL(pj_stun_parse_msg) +PJ_EXPORT_SYMBOL(pj_stun_msg_find_attr) +PJ_EXPORT_SYMBOL(pj_stun_get_mapped_addr) +PJ_EXPORT_SYMBOL(pj_stun_get_err_msg) + +/* + * xml.h + */ +PJ_EXPORT_SYMBOL(pj_xml_parse) +PJ_EXPORT_SYMBOL(pj_xml_print) +PJ_EXPORT_SYMBOL(pj_xml_add_node) +PJ_EXPORT_SYMBOL(pj_xml_add_attr) +PJ_EXPORT_SYMBOL(pj_xml_find_node) +PJ_EXPORT_SYMBOL(pj_xml_find_next_node) +PJ_EXPORT_SYMBOL(pj_xml_find_attr) +PJ_EXPORT_SYMBOL(pj_xml_find) + + diff --git a/pjlib/build/Makefile b/pjlib/build/Makefile index 595cce88..c815b42c 100644 --- a/pjlib/build/Makefile +++ b/pjlib/build/Makefile @@ -1,56 +1,4 @@ -# -# Include host/target/compiler selection. -# This will export CC_NAME, MACHINE_NAME, OS_NAME, and HOST_NAME variables. -# -include ../../build.mak - -# -# Include global compiler specific definitions -# -include ../../build/cc-$(CC_NAME).mak - -# -# (Optionally) Include compiler specific configuration that is -# specific to this project. This configuration file is -# located in this directory. -# --include cc-$(CC_NAME).mak - -# -# Include global machine specific definitions -# -include ../../build/m-$(MACHINE_NAME).mak --include m-$(MACHINE_NAME).mak - -# -# Include target OS specific definitions -# -include ../../build/os-$(OS_NAME).mak - -# -# (Optionally) Include target OS specific configuration that is -# specific to this project. This configuration file is -# located in this directory. -# --include os-$(OS_NAME).mak - -# -# Include host specific definitions -# -include ../../build/host-$(HOST_NAME).mak - -# -# (Optionally) Include host specific configuration that is -# specific to this project. This configuration file is -# located in this directory. -# --include host-$(HOST_NAME).mak - -# -# Include global user configuration, if any -# --include ../../user.mak - +include ../../build/common.mak RULES_MAK := ../../build/rules.mak -- cgit v1.2.3