master

[nexero]

Had to change some files for successful building with linux platform. not sure, if it breaks something for win32 or macos, though..

[antrad]

Hello. I browsed through your changes and I guess most of it should be fine (though I have very limited/no knowledge of Cmake and cross platform programming), but I currently don't have the PC set up to test it, I'm having a break from coding and all.

[tsudoko]

Had to change a bit more to get it to compile on Gentoo:

diff --git a/src/common.h b/src/common.h
index ee45256..a798dfb 100644
--- a/src/common.h
+++ b/src/common.h
@@ -16,6 +16,7 @@
 //
 #include <SDL2/SDL_config.h>//AR (#include <SDL_config.h>)
 #include <stdio.h>
+#include <stdint.h>

 #ifdef _MSC_VER
 // For simplicity sake, just make snprintf sprintf_s even though they aren't quite the same
diff --git a/src/sdlport/video.cpp b/src/sdlport/video.cpp
index b126044..9a0247a 100644
--- a/src/sdlport/video.cpp
+++ b/src/sdlport/video.cpp
@@ -27,7 +27,7 @@
 #ifdef WIN32
 #include <windows.h>
 #endif
-#include "GLee.h"
+#include <GL/GLee.h>
 //Abuse linker->input:
 // - opengl32.lib
 // - GLee.lib
diff --git a/src/tool/AR_SPEC.h b/src/tool/AR_SPEC.h
index 70e1d60..edc1359 100644
--- a/src/tool/AR_SPEC.h
+++ b/src/tool/AR_SPEC.h
@@ -25,7 +25,6 @@
 // - linker
 //     cv210.lib
 //     cxcore210.lib
-//     highgui210.lib
 // - libraries
 //     OpenCV2.1\lib
 // - include
@@ -60,7 +59,6 @@
 #include <sstream>

 #include <opencv2/opencv.hpp>
-#include <opencv2/highgui.hpp>
 using namespace cv;

 #include "common.h"

[monreal]

I just compiled this on Fedora 26. Needed to apply both patchsets.

[tuomosipola]

Just compiled on Ubuntu 19.04. Applied both patches.

In addition, GLee seems to be unmaintaided (and not included in Ubuntu), so the more modern glew should be used in src/sdlport/video.cpp: change #include "GLee.h" to #include <GL/glew.h>

[ghost]

@tuomosipola Could you try my fork? It uses Glad instead of GLee or glew, as well as some other changes.

[tuomosipola]

@fluffrabbit Sorry, I just noticed this message. Tried it. It compiles and I could play a bit. No sound, but I don't think even this fork had them.

[ghost]

Just a quick reply here: Thanks for trying it! I do get sound on my end. The sound issue could be due to some superfluous memory allocation from the pre-SDL2 days which I neglected to remove. (It also causes a sort of freeze when the game starts up.) To the best of my memory, mine also doesn't doesn't save games correctly (some issue with CMake specifying the wrong path). I'll take a look when I get more time.

…

On 2020-03-01 12:22 AM, Tuomo Sipola wrote: @fluffrabbit [1] Sorry, I just noticed this message. Tried it. It compiles and I could play a bit. No sound, but I don't think even this fork had them. -- You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub [2], or unsubscribe [3]. Links: ------ [1] https://github.com/fluffrabbit [2] #1?email_source=notifications&email_token=ABSUA3XE5MYHP6KG7PAPVGDRFILK5A5CNFSM4CJY3C5KYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOENMYOKI#issuecomment-593069865 [3] https://github.com/notifications/unsubscribe-auth/ABSUA3RPNRVURLB673FKVHDRFILK5ANCNFSM4CJY3C5A