Use wxGetInstallPrefix() instead of wxINSTALL_PREFIX (makes relocatable packages...

[wxWidgets.git] / src / wxvc_universal.dsp

diff --git a/src/wxvc_universal.dsp b/src/wxvc_universal.dsp
index ca31ee0ada183994c82eef5551dc9350b7a0621d..65d2a47f16a9383e925187dd32ae67a094cf801c 100644 (file)
--- a/src/wxvc_universal.dsp
+++ b/src/wxvc_universal.dsp
@@ -49,7 +49,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\lib\wx_univ.lib"
+# ADD LIB32 /nologo /out:"..\lib\wxuniv.lib"
 
 !ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
 
@@ -60,11 +60,11 @@ LIB32=link.exe -lib
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "msw/UnivDebug"
-# PROP Intermediate_Dir "msw/UnivDebug"
+# PROP Output_Dir "../UnivDebug"
+# PROP Intermediate_Dir "../UnivDebug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
 # ADD BASE RSC /l 0x809
 # ADD RSC /l 0x809
 BSC32=bscmake.exe
@@ -72,7 +72,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\lib\wx_univd.lib"
+# ADD LIB32 /nologo /out:"..\lib\wxunivd.lib"
 
 !ENDIF 
 
@@ -113,6 +113,10 @@ SOURCE=.\common\config.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\containr.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\cshelp.cpp
 # End Source File
 # Begin Source File
@@ -169,12 +173,6 @@ SOURCE=.\common\docview.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\dosyacc.c
-# ADD CPP /D "USE_DEFINE" /D "YY_USE_PROTOS" /D "IDE_INVOKED"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
 SOURCE=.\common\dynarray.cpp
 # End Source File
 # Begin Source File
@@ -464,6 +462,10 @@ SOURCE=.\common\string.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\sysopt.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\tbarbase.cpp
 # End Source File
 # Begin Source File
@@ -484,6 +486,10 @@ SOURCE=.\common\tokenzr.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\toplvcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\treebase.cpp
 # End Source File
 # Begin Source File
@@ -592,6 +598,10 @@ SOURCE=.\generic\dragimgg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\fdrepdlg.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\fontdlgg.cpp
 # End Source File
 # Begin Source File
@@ -620,6 +630,10 @@ SOURCE=.\generic\helpwxht.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\imaglist.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\laywin.cpp
 # End Source File
 # Begin Source File
@@ -664,7 +678,7 @@ SOURCE=.\generic\sashwin.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\generic\scrolwin.cpp
+SOURCE=.\generic\scrlwing.cpp
 # End Source File
 # Begin Source File
 
@@ -721,82 +735,262 @@ SOURCE=.\generic\wizard.cpp
 # Begin Source File
 
 SOURCE=.\html\helpctrl.cpp
+
+!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=.\html\helpdata.cpp
+
+!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=.\html\helpfrm.cpp
+
+!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=.\html\htmlcell.cpp
+
+!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=.\html\htmlfilt.cpp
+
+!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=.\html\htmlpars.cpp
+
+!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=.\html\htmltag.cpp
+
+!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=.\html\htmlwin.cpp
+
+!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=.\html\htmprint.cpp
+
+!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=.\html\m_dflist.cpp
+
+!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=.\html\m_fonts.cpp
+
+!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=.\html\m_hline.cpp
+
+!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=.\html\m_image.cpp
+
+!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=.\html\m_layout.cpp
+
+!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=.\html\m_links.cpp
+
+!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=.\html\m_list.cpp
+
+!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=.\html\m_meta.cpp
+
+!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=.\html\m_pre.cpp
+
+!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=.\html\m_tables.cpp
+
+!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=.\html\winpars.cpp
+
+!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # End Group
 # Begin Group "MSW Files"
@@ -864,10 +1058,6 @@ SOURCE=.\msw\dde.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\dialog.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\msw\dialup.cpp
 # End Source File
 # Begin Source File
@@ -963,10 +1153,6 @@ SOURCE=.\msw\icon.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\imaglist.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\msw\iniconf.cpp
 # End Source File
 # Begin Source File
@@ -1043,6 +1229,10 @@ SOURCE=.\msw\timer.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\toplevel.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\utils.cpp
 # End Source File
 # Begin Source File
@@ -1058,34 +1248,6 @@ SOURCE=.\msw\wave.cpp
 SOURCE=.\msw\window.cpp
 # End Source File
 # End Group
-# Begin Group "OLE Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\msw\ole\automtn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\dataobj.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\dropsrc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\droptgt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\oleutils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\uuid.cpp
-# End Source File
-# End Group
 # Begin Group "Setup"
 
 # PROP Default_Filter ""
@@ -1127,6 +1289,10 @@ SOURCE=.\univ\control.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\univ\dialog.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\univ\framuniv.cpp
 # End Source File
 # Begin Source File
@@ -1139,6 +1305,10 @@ SOURCE=.\univ\themes\gtk.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\univ\inpcons.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\univ\inphand.cpp
 # End Source File
 # Begin Source File
@@ -1211,6 +1381,10 @@ SOURCE=.\univ\theme.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\univ\topluniv.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\univ\themes\win32.cpp
 # End Source File
 # Begin Source File