commit 34c93de9

sago007 · 2016-01-07 17:46
34c93de9ef58e3fbbf0af4ac5c4b68caa1e34525 patch · browse files
parent 9dc8098287c121a40780445ba166ea88cd7612fa

Fixed Windows build

Changed files

M	.gitignore before
M	source/code/highscore.h before
M	source/code/main.cpp before

diff --git a/.gitignore b/.gitignore index 1003028..2b5bb0c 100644 --- a/.gitignore +++ b/.gitignore

@@ -3,3 +3,8 @@

*.o

*.orig

+winicon.res

+nbproject

+.*

+-.travis.yml

+-.gitignore

diff --git a/source/code/highscore.h b/source/code/highscore.h index 8fcc950..10cffdf 100644 --- a/source/code/highscore.h +++ b/source/code/highscore.h

@@ -27,15 +27,6 @@ http://blockattack.net

#include <string>

#include <stdlib.h>

-#ifdef _WIN32

-#ifndef CSIDL_PERSONAL

-#define CSIDL_PERSONAL 0x0005

-#endif

-#define _WIN32_IE 0x0400

-#include "windows.h"

-#include <shlobj.h>

-#endif

const int top = 10;

struct record

diff --git a/source/code/main.cpp b/source/code/main.cpp index e99704a..4cd32c9 100644 --- a/source/code/main.cpp +++ b/source/code/main.cpp

@@ -2041,6 +2041,7 @@ int main(int argc, char* argv[]) {

screen = renderer;

//Init the file system abstraction layer

PHYSFS_init(argv[0]);

+ PHYSFS_addToSearchPath(((string)SHAREDIR+"/blockattack.data").c_str(), 1);

PHYSFS_addToSearchPath( ((string) PHYSFS_getBaseDir()+"/data").c_str(), 1);

//Load default theme

sago::SagoDataHolder d(renderer);