Commit 752fbf73 authored by Phillip Castaneda's avatar Phillip Castaneda
Browse files

Getting rid of DLL linkage on FF demo

parent 4b11dd5a
......@@ -64,10 +64,10 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ois_d.lib"
AdditionalDependencies="ois_static_d.lib"
OutputFile="$(OutDir)/DemoFFTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="..\..\dll;..\..\src\win32\extras\WiiMote"
AdditionalLibraryDirectories="..\..\lib;..\..\src\win32\extras\WiiMote"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/DemoFFTest.pdb"
SubSystem="1"
......@@ -99,9 +99,9 @@
/>
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="1"
CharacterSet="2"
>
......@@ -119,16 +119,17 @@
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\..\includes;..\DemoFFTest"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_STLP_DEBUG"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
......@@ -145,16 +146,17 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ois_d.lib"
AdditionalDependencies="ois_static.lib"
OutputFile="$(OutDir)/DemoFFTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="..\..\lib64"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\lib;..\..\src\win32\extras\WiiMote"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/DemoFFTest.pdb"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="17"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
......@@ -180,9 +182,9 @@
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="2"
>
......@@ -200,17 +202,16 @@
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="true"
Optimization="0"
AdditionalIncludeDirectories="..\..\includes;..\DemoFFTest"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_STLP_DEBUG"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
......@@ -227,17 +228,16 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ois.lib"
AdditionalDependencies="ois_d.lib"
OutputFile="$(OutDir)/DemoFFTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\dll;..\..\src\win32\extras\WiiMote"
LinkIncremental="2"
AdditionalLibraryDirectories="..\..\lib64"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/DemoFFTest.pdb"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
......
//////////////////////////////// OS Neutral Headers ////////////////
//Define this to make OIS use dynamic linking imports:
//#define OIS_DYNAMIC_LIB
#include "OIS.h"
#include <math.h>
......@@ -14,7 +10,6 @@
using namespace std;
////////////////////////////////////Needed Windows Headers////////////
#if defined OIS_WIN32_PLATFORM
# define WIN32_LEAN_AND_MEAN
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment