summaryrefslogtreecommitdiff
path: root/apr.dsp
diff options
context:
space:
mode:
authorwrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>2000-05-26 16:23:37 +0000
committerwrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>2000-05-26 16:23:37 +0000
commit45ed8327ceaaf12e02fe2b425569aa606496f8e4 (patch)
treedbf960b4bef92de87f8e03af704563abe8c5b861 /apr.dsp
parentd96e95f8e64abe4eeb5cc25c5364d8096050782d (diff)
downloadlibapr-45ed8327ceaaf12e02fe2b425569aa606496f8e4.tar.gz
Mass update of API_IMPORT/EXPORT symbols TO APR_ symbols.
APR is -NOT- the Apache server, so the import/export declations cannot use the same defined symbols. Other minor changes API_THREAD_PROC is now APR_THREAD_PROC. API_VAR_IMPORT/EXPORT are now APR_IMPORT/EXPORT_VAR, to allow easier grepping. The new compilation switches APR_STATIC and APR_EXPORT_SYMBOLS allow the builder to select either static linked or the creation of the export symbols for APR. The aprlib and aprlibdll .dsp projects now include the later symbol. More cleanups from recent commits are still needed, as well as a thorough review of the distinction between APR_EXPORT and APR_EXPORT_NONSTD. The later is used only for pure __cdecl required functions, such as variable arguments (not va array arguments, those are not an issue.) git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@60101 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'apr.dsp')
-rw-r--r--apr.dsp15
1 files changed, 8 insertions, 7 deletions
diff --git a/apr.dsp b/apr.dsp
index 38ebe77eb..138a620dd 100644
--- a/apr.dsp
+++ b/apr.dsp
@@ -26,7 +26,6 @@ CFG=aprlib - Win32 Debug
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
-RSC=rc.exe
!IF "$(CFG)" == "aprlib - Win32 Release"
@@ -40,11 +39,12 @@ RSC=rc.exe
# PROP Output_Dir "LibR"
# PROP Intermediate_Dir "LibR"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "misc/unix" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# SUBTRACT CPP /YX
+RSC=rc.exe
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "misc/unix" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "NDEBUG" /D "APR_EXPORT_SYMBOLS" /D "WIN32" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /YX
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
@@ -65,11 +65,12 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "LibD"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "misc/unix" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# SUBTRACT CPP /YX
+RSC=rc.exe
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "misc/unix" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "_DEBUG" /D "APR_EXPORT_SYMBOLS" /D "WIN32" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /YX
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo