From 9f4c5a6ed4e490fb51aa207c2def75fcb2622584 Mon Sep 17 00:00:00 2001
From: James Haley
Date: Fri, 10 Sep 2010 01:53:57 +0000
Subject: 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
---
msvc/chocolate.sln | 6 ++
msvc/libopl.vcproj | 232 +++++++++++++++++++++++++++++++++++++++++++++++++++++
msvc/strife.vcproj | 24 +++++-
3 files changed, 260 insertions(+), 2 deletions(-)
create mode 100644 msvc/libopl.vcproj
(limited to 'msvc')
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
diff --git a/msvc/libopl.vcproj b/msvc/libopl.vcproj
new file mode 100644
index 00000000..f7fbb59b
--- /dev/null
+++ b/msvc/libopl.vcproj
@@ -0,0 +1,232 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/msvc/strife.vcproj b/msvc/strife.vcproj
index a78a52e6..63778125 100644
--- a/msvc/strife.vcproj
+++ b/msvc/strife.vcproj
@@ -41,7 +41,7 @@
+
+
@@ -373,6 +377,10 @@
RelativePath="..\src\w_file.h"
>
+
+
@@ -641,6 +649,10 @@
RelativePath="..\src\i_main.c"
>
+
+
@@ -713,6 +725,10 @@
RelativePath="..\src\memio.c"
>
+
+
@@ -773,6 +789,10 @@
RelativePath="..\src\w_file_win32.c"
>
+
+
--
cgit v1.2.3