Skip to content

GitLab

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

Getting rid of DLL linkage on FF demo

parent 4b11dd5a
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 37 deletions
Win32/DemoFFTest/DemoFFTest_vc9.vcproj
View file @ 752fbf73
...@@ -64,10 +64,10 @@ ...@@ -64,10 +64,10 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="ois_d.lib" AdditionalDependencies="ois_static_d.lib"
OutputFile="$(OutDir)/DemoFFTest.exe" OutputFile="$(OutDir)/DemoFFTest.exe"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="..\..\dll;..\..\src\win32\extras\WiiMote" AdditionalLibraryDirectories="..\..\lib;..\..\src\win32\extras\WiiMote"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/DemoFFTest.pdb" ProgramDatabaseFile="$(OutDir)/DemoFFTest.pdb"
SubSystem="1" SubSystem="1"
...@@ -99,9 +99,9 @@ ...@@ -99,9 +99,9 @@
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Release|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)" OutputDirectory="Release"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="Release"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
> >
...@@ -119,16 +119,17 @@ ...@@ -119,16 +119,17 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TargetEnvironment="3"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\..\includes;..\DemoFFTest" AdditionalIncludeDirectories="..\..\includes;..\DemoFFTest"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_STLP_DEBUG" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
MinimalRebuild="true" StringPooling="true"
BasicRuntimeChecks="3" RuntimeLibrary="2"
RuntimeLibrary="3" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="true" Detect64BitPortabilityProblems="true"
...@@ -145,16 +146,17 @@ ...@@ -145,16 +146,17 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="ois_d.lib" AdditionalDependencies="ois_static.lib"
OutputFile="$(OutDir)/DemoFFTest.exe" OutputFile="$(OutDir)/DemoFFTest.exe"
LinkIncremental="2" LinkIncremental="1"
AdditionalLibraryDirectories="..\..\lib64" AdditionalLibraryDirectories="..\..\lib;..\..\src\win32\extras\WiiMote"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/DemoFFTest.pdb"
SubSystem="1" SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
RandomizedBaseAddress="1" RandomizedBaseAddress="1"
DataExecutionPrevention="0" DataExecutionPrevention="0"
TargetMachine="17" TargetMachine="1"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -180,9 +182,9 @@ ...@@ -180,9 +182,9 @@
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Debug|x64"
OutputDirectory="Release" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="Release" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
> >
...@@ -200,17 +202,16 @@ ...@@ -200,17 +202,16 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TargetEnvironment="3"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" Optimization="0"
InlineFunctionExpansion="1"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\..\includes;..\DemoFFTest" AdditionalIncludeDirectories="..\..\includes;..\DemoFFTest"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_STLP_DEBUG"
StringPooling="true" MinimalRebuild="true"
RuntimeLibrary="2" BasicRuntimeChecks="3"
EnableFunctionLevelLinking="true" RuntimeLibrary="3"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="true" Detect64BitPortabilityProblems="true"
...@@ -227,17 +228,16 @@ ...@@ -227,17 +228,16 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="ois.lib" AdditionalDependencies="ois_d.lib"
OutputFile="$(OutDir)/DemoFFTest.exe" OutputFile="$(OutDir)/DemoFFTest.exe"
LinkIncremental="1" LinkIncremental="2"
AdditionalLibraryDirectories="..\..\dll;..\..\src\win32\extras\WiiMote" AdditionalLibraryDirectories="..\..\lib64"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/DemoFFTest.pdb"
SubSystem="1" SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
RandomizedBaseAddress="1" RandomizedBaseAddress="1"
DataExecutionPrevention="0" DataExecutionPrevention="0"
TargetMachine="1" TargetMachine="17"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
......
demos/FFConsoleDemo.cpp
View file @ 752fbf73
//////////////////////////////// OS Neutral Headers ////////////////
//Define this to make OIS use dynamic linking imports:
//#define OIS_DYNAMIC_LIB
#include "OIS.h" #include "OIS.h"
#include <math.h> #include <math.h>
...@@ -14,7 +10,6 @@ ...@@ -14,7 +10,6 @@
using namespace std; using namespace std;
////////////////////////////////////Needed Windows Headers//////////// ////////////////////////////////////Needed Windows Headers////////////
#if defined OIS_WIN32_PLATFORM #if defined OIS_WIN32_PLATFORM
# define WIN32_LEAN_AND_MEAN # 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