Skip to content

Commit dbcfb76

Browse files
committed
COMMON: use submodules for ext libs
1 parent dbc199f commit dbcfb76

File tree

25 files changed

+35
-10209
lines changed

25 files changed

+35
-10209
lines changed

.gitmodules

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
11
[submodule "src/lib/miniaudio"]
22
path = src/lib/miniaudio
33
url = https://github.com/dr-soft/miniaudio.git
4+
[submodule "src/lib/stb"]
5+
path = src/lib/stb
6+
url = https://github.com/nothings/stb.git
7+
[submodule "src/lib/lodepng"]
8+
path = src/lib/lodepng
9+
url = https://github.com/lvandeve/lodepng.git
10+
[submodule "src/lib/jsmn"]
11+
path = src/lib/jsmn
12+
url = https://github.com/zserge/jsmn.git

autogen.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
ln -sf README.md README
1010

11+
git submodule update --
12+
1113
pkg-config --version > /dev/null || echo "Please install pkg-config"
1214

1315
rm -f acinclude.m4

src/common/Makefile.am

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ noinst_LIBRARIES = libsb_common.a
3939

4040
libsb_common_a_SOURCES = \
4141
../lib/match.c ../lib/match.h \
42-
../lib/lodepng.c ../lib/lodepng.h \
4342
../lib/str.c ../lib/str.h \
4443
../lib/matrix.c \
4544
../lib/xpm.c \

src/common/device.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77
//
88
// Copyright(C) 2000 Nicholas Christopoulos
99

10+
#include "config.h"
11+
12+
#include "include/osd.h"
1013
#include "common/device.h"
1114
#include "common/smbas.h"
1215
#include "common/messages.h"
1316
#include "common/keymap.h"
14-
#include "common/osd.h"
1517
#include "common/inet.h"
1618

1719
#ifdef __MINGW32__

src/common/screen.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
#define DEVICE_MODULE
1111

12+
#include "include/osd.h"
1213
#include "common/device.h"
1314
#include "common/messages.h"
14-
#include "common/osd.h"
1515
#include "common/sberr.h"
1616
#include "common/blib.h"
1717

src/common/var_map.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#define TOKEN_GROW_SIZE 16
1919
#define JSMN_STATIC
2020

21-
#include "lib/jsmn.h"
21+
#include "lib/jsmn/jsmn.h"
2222

2323
/**
2424
* Container for map_from_str
File renamed without changes.

src/lib/jsmn

Submodule jsmn added at 85695f3

0 commit comments

Comments
 (0)