1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
|
Index: trunk/Makefiles/Makefile.SDL.UNIX.GCC
===================================================================
--- trunk.orig/Makefiles/Makefile.SDL.UNIX.GCC 2017-04-17 00:28:55.000000000 -0300
+++ trunk/Makefiles/Makefile.SDL.UNIX.GCC 2017-04-17 00:32:04.557901364 -0300
@@ -70,6 +70,10 @@
# Compiler and Linker
###############################################################################
+USE_SHARED_MINIZIP ?= 0
+USE_SHARED_GLEW ?= 0
+USE_SHARED_TINYXML ?= 0
+
CC = gcc
LD = gcc
COMPILER_FLAGS = $(SDL_CFLAGS) -ISrc/ -ISrc/OSD/SDL/ -ISrc/Pkgs/ -c -Wall -O3
@@ -96,7 +100,7 @@
#
HEADERS = Src/Supermodel.h Src/OSD/SDL/Types.h
OBJ = $(OBJ_DIR)/PPCDisasm.o $(OBJ_DIR)/BlockFile.o $(OBJ_DIR)/93C46.o \
- $(OBJ_DIR)/unzip.o $(OBJ_DIR)/ioapi.o $(OBJ_DIR)/Error.o $(OBJ_DIR)/glew.o $(OBJ_DIR)/Shader.o \
+ $(OBJ_DIR)/Error.o $(OBJ_DIR)/Shader.o \
$(OBJ_DIR)/Real3D.o $(OBJ_DIR)/Legacy3D.o $(OBJ_DIR)/Models.o $(OBJ_DIR)/TextureRefs.o \
$(OBJ_DIR)/New3D.o $(OBJ_DIR)/Mat4.o $(OBJ_DIR)/Model.o $(OBJ_DIR)/PolyHeader.o $(OBJ_DIR)/Texture.o $(OBJ_DIR)/TextureSheet.o $(OBJ_DIR)/VBO.o $(OBJ_DIR)/Vec.o $(OBJ_DIR)/R3DShader.o $(OBJ_DIR)/R3DFloat.o $(OBJ_DIR)/R3DScrollFog.o \
$(OBJ_DIR)/Render2D.o $(OBJ_DIR)/TileGen.o \
@@ -117,7 +121,6 @@
$(OBJ_DIR)/ByteSwap.o \
$(OBJ_DIR)/ConfigBuilders.o \
$(OBJ_DIR)/GameLoader.o \
- $(OBJ_DIR)/tinyxml2.o \
$(OBJ_DIR)/ROMSet.o
# If built-in debugger enabled, include all debugging classes
@@ -128,6 +131,27 @@
$(OBJ_DIR)/PPCDebug.o $(OBJ_DIR)/68KDebug.o $(OBJ_DIR)/Musashi68KDebug.o $(OBJ_DIR)/Z80Debug.o
endif
+ifeq ($(USE_SHARED_GLEW), 1)
+ LFLAGS += -lGLEW
+ COMPILER_FLAGS += -DSHARED_GLEW
+else
+ OBJ += $(OBJ_DIR)/glew.o
+endif
+
+ifeq ($(USE_SHARED_MINIZIP), 1)
+ LFLAGS += -lminizip
+ COMPILER_FLAGS += -DSHARED_MINIZIP
+else
+ OBJ += $(OBJ_DIR)/unzip.o $(OBJ_DIR)/ioapi.o
+endif
+
+ifeq ($(USE_SHARED_TINYXML), 1)
+ LFLAGS += -ltinyxml2
+ COMPILER_FLAGS += -DSHARED_TINYXML
+else
+ OBJ += $(OBJ_DIR)/tinyxml2.o
+endif
+
#
# Targets
#
Index: trunk/Src/Graphics/Legacy3D/Legacy3D.h
===================================================================
--- trunk.orig/Src/Graphics/Legacy3D/Legacy3D.h 2017-04-17 00:28:55.000000000 -0300
+++ trunk/Src/Graphics/Legacy3D/Legacy3D.h 2017-04-17 00:29:53.000000000 -0300
@@ -30,7 +30,11 @@
#define INCLUDED_LEGACY3D_H
#include "Graphics/IRender3D.h"
+#ifdef SHARED_GLEW
+#include <GL/glew.h>
+#else
#include "Pkgs/glew.h"
+#endif
#include "Util/NewConfig.h"
namespace Legacy3D {
Index: trunk/Src/Graphics/New3D/New3D.h
===================================================================
--- trunk.orig/Src/Graphics/New3D/New3D.h 2017-04-17 00:28:55.000000000 -0300
+++ trunk/Src/Graphics/New3D/New3D.h 2017-04-17 00:29:53.000000000 -0300
@@ -28,7 +28,11 @@
#ifndef INCLUDED_NEW3D_H
#define INCLUDED_NEW3D_H
+#ifdef SHARED_GLEW
+#include <GL/glew.h>
+#else
#include "Pkgs/glew.h"
+#endif
#include "Types.h"
#include "TextureSheet.h"
#include "Graphics/IRender3D.h"
Index: trunk/Src/Graphics/New3D/R3DShader.h
===================================================================
--- trunk.orig/Src/Graphics/New3D/R3DShader.h 2017-04-17 00:28:55.000000000 -0300
+++ trunk/Src/Graphics/New3D/R3DShader.h 2017-04-17 00:29:53.000000000 -0300
@@ -1,7 +1,11 @@
#ifndef _R3DSHADER_H_
#define _R3DSHADER_H_
+#ifdef SHARED_GLEW
+#include <GL/glew.h>
+#else
#include "Pkgs/glew.h"
+#endif
#include "Model.h"
namespace New3D {
Index: trunk/Src/Graphics/New3D/Texture.h
===================================================================
--- trunk.orig/Src/Graphics/New3D/Texture.h 2017-04-17 00:28:55.000000000 -0300
+++ trunk/Src/Graphics/New3D/Texture.h 2017-04-17 00:29:53.000000000 -0300
@@ -2,7 +2,11 @@
#define _TEXTURE_H_
#include "Types.h"
+#ifdef SHARED_GLEW
+#include <GL/glew.h> //arg
+#else
#include "Pkgs/glew.h" //arg
+#endif
namespace New3D {
Index: trunk/Src/Graphics/New3D/VBO.h
===================================================================
--- trunk.orig/Src/Graphics/New3D/VBO.h 2017-04-17 00:28:55.000000000 -0300
+++ trunk/Src/Graphics/New3D/VBO.h 2017-04-17 00:29:53.000000000 -0300
@@ -1,7 +1,11 @@
#ifndef _VBO_H_
#define _VBO_H_
+#ifdef SHARED_GLEW
+#include <GL/glew.h>
+#else
#include "Pkgs/glew.h"
+#endif
namespace New3D {
Index: trunk/Src/Graphics/Render2D.cpp
===================================================================
--- trunk.orig/Src/Graphics/Render2D.cpp 2017-04-17 00:28:55.000000000 -0300
+++ trunk/Src/Graphics/Render2D.cpp 2017-04-17 00:29:53.000000000 -0300
@@ -275,7 +275,11 @@
*/
#include <cstring>
+#ifdef SHARED_GLEW
+#include <GL/glew.h>
+#else
#include "Pkgs/glew.h"
+#endif
#include "Supermodel.h"
#include "Graphics/Shaders2D.h" // fragment and vertex shaders
Index: trunk/Src/Graphics/Render2D.h
===================================================================
--- trunk.orig/Src/Graphics/Render2D.h 2017-04-17 00:28:55.000000000 -0300
+++ trunk/Src/Graphics/Render2D.h 2017-04-17 00:29:53.000000000 -0300
@@ -28,7 +28,11 @@
#ifndef INCLUDED_RENDER2D_H
#define INCLUDED_RENDER2D_H
+#ifdef SHARED_GLEW
+#include <GL/glew.h>
+#else
#include "Pkgs/glew.h"
+#endif
/*
Index: trunk/Src/Graphics/Shader.cpp
===================================================================
--- trunk.orig/Src/Graphics/Shader.cpp 2017-04-17 00:28:55.000000000 -0300
+++ trunk/Src/Graphics/Shader.cpp 2017-04-17 00:29:53.000000000 -0300
@@ -44,7 +44,11 @@
#include <new>
#include <cstdio>
+#ifdef SHARED_GLEW
+#include <GL/glew.h>
+#else
#include "Pkgs/glew.h"
+#endif
#include "Supermodel.h"
Index: trunk/Src/Graphics/Shader.h
===================================================================
--- trunk.orig/Src/Graphics/Shader.h 2017-04-17 00:28:55.000000000 -0300
+++ trunk/Src/Graphics/Shader.h 2017-04-17 00:29:53.000000000 -0300
@@ -28,7 +28,11 @@
#ifndef INCLUDED_SHADER_H
#define INCLUDED_SHADER_H
+#ifdef SHARED_GLEW
+#include <GL/glew.h>
+#else
#include "Pkgs/glew.h"
+#endif
#include <string>
/*
Index: trunk/Src/OSD/SDL/Main.cpp
===================================================================
--- trunk.orig/Src/OSD/SDL/Main.cpp 2017-04-17 00:28:55.000000000 -0300
+++ trunk/Src/OSD/SDL/Main.cpp 2017-04-17 00:29:53.000000000 -0300
@@ -57,7 +57,11 @@
#include <memory>
#include <vector>
#include <algorithm>
+#ifdef SHARED_GLEW
+#include <GL/glew.h>
+#else
#include "Pkgs/glew.h"
+#endif
#ifdef SUPERMODEL_OSX
#include <SDL/SDL.h>
#else
Index: trunk/Src/Util/ConfigBuilders.cpp
===================================================================
--- trunk.orig/Src/Util/ConfigBuilders.cpp 2017-04-17 00:28:55.000000000 -0300
+++ trunk/Src/Util/ConfigBuilders.cpp 2017-04-17 00:29:53.000000000 -0300
@@ -1,6 +1,10 @@
#include "Util/NewConfig.h"
#include "OSD/Logger.h"
+#ifdef SHARED_TINYXML
+#include <tinyxml2.h>
+#else
#include "Pkgs/tinyxml2.h"
+#endif
#include <algorithm>
#include <fstream>
#include <queue>
Index: trunk/Src/GameLoader.h
===================================================================
--- trunk.orig/Src/GameLoader.h 2017-04-17 00:28:55.000000000 -0300
+++ trunk/Src/GameLoader.h 2017-04-17 00:29:53.000000000 -0300
@@ -2,7 +2,11 @@
#define INCLUDED_GAMELOADER_H
#include "Util/NewConfig.h"
+#ifdef SHARED_MINIZIP
+#include <minizip/unzip.h>
+#else
#include "Pkgs/unzip.h"
+#endif
#include "Game.h"
#include "ROMSet.h"
#include <map>
|