Permalink
Browse files

Fixes for rebuild.

  • Loading branch information...
namaste
namaste committed Jun 20, 2008
1 parent 2fdbfa6 commit 2f03a3bc6a3a62f0b7b8841cc9fa9d15a46f7a58
Showing with 11 additions and 10 deletions.
  1. +1 −1 open/soylib/include/soy/Font.h
  2. +2 −0 open/soylib/include/soy/util.h
  3. +8 −9 open/soylib/soylib.vcproj
@@ -7,7 +7,7 @@
#include <GL/gl.h>
#include <GL/glu.h>
#include <GL/glut.h>
-#include <SDL/SDL_ttf.h>
+#include <SDL_ttf.h>
#include <string>
class Font {
@@ -6,6 +6,8 @@
#include "soy/Viewport.h"
#include "soy/vec2.h"
+#define M_PI 3.14159265358979323846
+
inline double randrange(double a, double b) {
return double(rand()) / RAND_MAX * (b - a) + a;
}
View
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="soylib"
ProjectGUID="{BE3DF5E0-7E7C-47D5-84CF-1EDAE6762C00}"
Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -61,13 +62,15 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="opengl32.lib glu32.lib glaux.lib sdlmain.lib sdl.lib sdl_image.lib libexpat.lib"
+ AdditionalDependencies="opengl32.lib glu32.lib sdlmain.lib sdl.lib sdl_image.lib libexpat.lib"
OutputFile="$(OutDir)//$(ProjectName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""
GenerateDebugInformation="true"
GenerateMapFile="true"
MapExports="true"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -88,9 +91,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>
@@ -139,13 +139,15 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="opengl32.lib glu32.lib glaux.lib sdlmain.lib sdl.lib sdl_image.lib user32.lib"
+ AdditionalDependencies="opengl32.lib glu32.lib sdlmain.lib sdl.lib sdl_image.lib user32.lib"
OutputFile="$(OutDir)//$(ProjectName).dll"
LinkIncremental="1"
GenerateDebugInformation="false"
SubSystem="0"
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -166,9 +168,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>

0 comments on commit 2f03a3b

Please sign in to comment.