lolengine
/
lol
spegling av https://github.com/lolengine/lol
1
0
Förgrening 0
Kod Ärenden 0 Släpp 0 Wiki Aktiviteter
Bläddra i källkod

build: minor Win32 fixes for Jylam's project.

undefined
Sam Hocevar 11 år sedan
förälder
d46e63ff29
incheckning
e2eb9e9ed7
2 ändrade filer med 73 tillägg och 2 borttagningar
Delad Vy
Diff Options
Show Stats Download Patch File Download Diff File
  1. +62
    -2
      build/vs2012/Lol.sln
  2. +11
    -0
      src/core.h

+ 62
- 2
build/vs2012/Lol.sln Visa fil

@@ -158,6 +158,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Puzzle", "..\..\people\benl
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lolui", "..\..\people\benlitz\private\lolui\lolui.vcxproj", "{950EDCC1-DF6A-4A75-B083-DFE98E7DD34F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SinglShot", "SinglShot", "{50509BA3-D27B-4FAC-9772-9EC76146F709}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "singlshot", "..\..\games\singlshot\singlshot.vcxproj", "{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Jylam", "Jylam", "{454DE15C-9063-4EB1-AD6C-77D7150F15DF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chat", "..\..\people\jylam\private\chat\chat.vcxproj", "{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ORBIS = Debug|ORBIS
@@ -806,7 +814,8 @@ Global
{9F291982-8C81-4105-BF39-16844648E55F}.Debug|PS3.Build.0 = Debug|PS3
{9F291982-8C81-4105-BF39-16844648E55F}.Debug|Win32.ActiveCfg = Debug|Win32
{9F291982-8C81-4105-BF39-16844648E55F}.Debug|Win32.Build.0 = Debug|Win32
{9F291982-8C81-4105-BF39-16844648E55F}.Debug|x64.ActiveCfg = Debug|Win32
{9F291982-8C81-4105-BF39-16844648E55F}.Debug|x64.ActiveCfg = Debug|x64
{9F291982-8C81-4105-BF39-16844648E55F}.Debug|x64.Build.0 = Debug|x64
{9F291982-8C81-4105-BF39-16844648E55F}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
{9F291982-8C81-4105-BF39-16844648E55F}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
{9F291982-8C81-4105-BF39-16844648E55F}.Release|ORBIS.ActiveCfg = Release|ORBIS
@@ -815,7 +824,8 @@ Global
{9F291982-8C81-4105-BF39-16844648E55F}.Release|PS3.Build.0 = Release|PS3
{9F291982-8C81-4105-BF39-16844648E55F}.Release|Win32.ActiveCfg = Release|Win32
{9F291982-8C81-4105-BF39-16844648E55F}.Release|Win32.Build.0 = Release|Win32
{9F291982-8C81-4105-BF39-16844648E55F}.Release|x64.ActiveCfg = Release|Win32
{9F291982-8C81-4105-BF39-16844648E55F}.Release|x64.ActiveCfg = Release|x64
{9F291982-8C81-4105-BF39-16844648E55F}.Release|x64.Build.0 = Release|x64
{9F291982-8C81-4105-BF39-16844648E55F}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
{9F291982-8C81-4105-BF39-16844648E55F}.Release|Xbox 360.Build.0 = Release|Xbox 360
{950EDCC1-DF6A-4A75-B083-DFE98E7DD34F}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
@@ -838,6 +848,52 @@ Global
{950EDCC1-DF6A-4A75-B083-DFE98E7DD34F}.Release|x64.Build.0 = Release|x64
{950EDCC1-DF6A-4A75-B083-DFE98E7DD34F}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
{950EDCC1-DF6A-4A75-B083-DFE98E7DD34F}.Release|Xbox 360.Build.0 = Release|Xbox 360
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Debug|ORBIS.Build.0 = Debug|ORBIS
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Debug|PS3.ActiveCfg = Debug|PS3
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Debug|PS3.Build.0 = Debug|PS3
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Debug|Win32.ActiveCfg = Debug|Win32
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Debug|Win32.Build.0 = Debug|Win32
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Debug|x64.ActiveCfg = Debug|x64
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Debug|x64.Build.0 = Debug|x64
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Release|ORBIS.ActiveCfg = Release|ORBIS
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Release|ORBIS.Build.0 = Release|ORBIS
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Release|PS3.ActiveCfg = Release|PS3
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Release|PS3.Build.0 = Release|PS3
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Release|Win32.ActiveCfg = Release|Win32
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Release|Win32.Build.0 = Release|Win32
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Release|x64.ActiveCfg = Release|x64
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Release|x64.Build.0 = Release|x64
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Release|Xbox 360.Build.0 = Release|Xbox 360
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|ORBIS.Build.0 = Debug|ORBIS
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|PS3.ActiveCfg = Debug|PS3
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|PS3.Build.0 = Debug|PS3
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|Win32.ActiveCfg = Debug|Win32
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|Win32.Build.0 = Debug|Win32
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|Win32.Deploy.0 = Debug|Win32
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|x64.ActiveCfg = Debug|x64
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|x64.Build.0 = Debug|x64
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|x64.Deploy.0 = Debug|x64
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|ORBIS.ActiveCfg = Release|ORBIS
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|ORBIS.Build.0 = Release|ORBIS
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|PS3.ActiveCfg = Release|PS3
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|PS3.Build.0 = Release|PS3
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|Win32.ActiveCfg = Release|Win32
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|Win32.Build.0 = Release|Win32
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|Win32.Deploy.0 = Release|Win32
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|x64.ActiveCfg = Release|x64
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|x64.Build.0 = Release|x64
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|x64.Deploy.0 = Release|x64
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|Xbox 360.Build.0 = Release|Xbox 360
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -848,9 +904,11 @@ Global
{0A1651FC-322B-4B04-82CB-28E9046D9383} = {5F1AAF03-7202-4C07-B99F-EB397105B1B7}
{E27FDF36-50C4-4ED2-8CF5-A20FED016910} = {5F1AAF03-7202-4C07-B99F-EB397105B1B7}
{B583BBFF-BE97-4F4E-BA1E-1F978A31EAB0} = {5F1AAF03-7202-4C07-B99F-EB397105B1B7}
{454DE15C-9063-4EB1-AD6C-77D7150F15DF} = {5F1AAF03-7202-4C07-B99F-EB397105B1B7}
{2F87CEAB-4818-443C-A5E3-6C34E7D967EC} = {1DFE1729-4F1B-47CA-9819-72431FE14E25}
{33704AA4-F2B5-4138-A40D-E3E77F89ED46} = {1DFE1729-4F1B-47CA-9819-72431FE14E25}
{8C77EAA8-1077-4EF7-AE53-97C6C60A3601} = {1DFE1729-4F1B-47CA-9819-72431FE14E25}
{50509BA3-D27B-4FAC-9772-9EC76146F709} = {1DFE1729-4F1B-47CA-9819-72431FE14E25}
{08C6A854-533D-4A1E-924E-C4A62281869F} = {928A359C-9C41-400A-8D2D-A054B33A79F5}
{9C66B179-0737-4BDA-AB42-2ADE478A9008} = {08C6A854-533D-4A1E-924E-C4A62281869F}
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C} = {08C6A854-533D-4A1E-924E-C4A62281869F}
@@ -889,5 +947,7 @@ Global
{9F291982-8C81-4105-BF39-16844648E55F} = {B583BBFF-BE97-4F4E-BA1E-1F978A31EAB0}
{950EDCC1-DF6A-4A75-B083-DFE98E7DD34F} = {B583BBFF-BE97-4F4E-BA1E-1F978A31EAB0}
{AA376B9B-484B-4DC4-982F-6CFA645E441E} = {F7D4A671-612F-4FF4-883F-2097697694B7}
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA} = {50509BA3-D27B-4FAC-9772-9EC76146F709}
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A} = {454DE15C-9063-4EB1-AD6C-77D7150F15DF}
EndGlobalSection
EndGlobal

+ 11
- 0
src/core.h Visa fil

@@ -93,6 +93,17 @@
#endif


/* Ensure we have ssize_t */
#if defined ssize_t
/* do nothing */
#elif HAVE_SYS_TYPES_H
# include <sys/types.h>
#elif _MSC_VER /* Visual Studio compiler */
# include <BaseTsd.h>
typedef SSIZE_T ssize_t;
#endif


/* Ensure isnan() is present even on systems that don't define it, or
* when -ffast-math is being used. */
#include <cmath>


Skriv Förhandsgranska
Laddar…
Avbryt
Spara