diff options
author | James Haley | 2010-09-10 01:53:57 +0000 |
---|---|---|
committer | James Haley | 2010-09-10 01:53:57 +0000 |
commit | 9f4c5a6ed4e490fb51aa207c2def75fcb2622584 (patch) | |
tree | 3f12bb085abcd77e071091bcd431e6c376288397 /msvc/chocolate.sln | |
parent | 120d90c67b2a4aa0a8883c4897241dee2222acd2 (diff) | |
download | chocolate-doom-9f4c5a6ed4e490fb51aa207c2def75fcb2622584.tar.gz chocolate-doom-9f4c5a6ed4e490fb51aa207c2def75fcb2622584.tar.bz2 chocolate-doom-9f4c5a6ed4e490fb51aa207c2def75fcb2622584.zip |
Post-merge fixes: Created project for OPL library. Fixed OPL library to
not use GNU C-isms such as inline keyword, declaration/statement mixing,
and strange calling convention syntax for import function pointers.
Fixed critical buffer overflow in M_BindChatControls - should be
back-merged immediately. Added autogenerated directories *back* to
ignore list.
Subversion-branch: /branches/strife-branch
Subversion-revision: 2052
Diffstat (limited to 'msvc/chocolate.sln')
-rw-r--r-- | msvc/chocolate.sln | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/msvc/chocolate.sln b/msvc/chocolate.sln index 5758df1c..2c9cca8b 100644 --- a/msvc/chocolate.sln +++ b/msvc/chocolate.sln @@ -32,6 +32,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtextscreen", "libtextscr EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Strife", "strife.vcproj", "{FC4DACBA-2A3E-4AF0-804A-AF5FFFD13B08}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopl", "libopl.vcproj", "{FC8D0610-1507-4F36-99BC-6F5A422B6AD3}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -70,6 +72,10 @@ Global {FC4DACBA-2A3E-4AF0-804A-AF5FFFD13B08}.Debug|Win32.Build.0 = Debug|Win32
{FC4DACBA-2A3E-4AF0-804A-AF5FFFD13B08}.Release|Win32.ActiveCfg = Release|Win32
{FC4DACBA-2A3E-4AF0-804A-AF5FFFD13B08}.Release|Win32.Build.0 = Release|Win32
+ {FC8D0610-1507-4F36-99BC-6F5A422B6AD3}.Debug|Win32.ActiveCfg = Debug|Win32
+ {FC8D0610-1507-4F36-99BC-6F5A422B6AD3}.Debug|Win32.Build.0 = Debug|Win32
+ {FC8D0610-1507-4F36-99BC-6F5A422B6AD3}.Release|Win32.ActiveCfg = Release|Win32
+ {FC8D0610-1507-4F36-99BC-6F5A422B6AD3}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
|