Skip to content

Commit e6ba203

Browse files
author
Michael B. McLaughlin
committed
Changes for GNU/Linux. Adaptation to use GTK+-3.0. Basic implementation of AutoTools-based build system. Builds cleanly with GCC and Clang. Changes were made to some of the Visual Studio files which may need fixing up on the Windows end. Built and tested on OpenSUSE 13.1.
1 parent 2fe6618 commit e6ba203

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+1304
-75
lines changed

.gitignore

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,3 +213,16 @@ pip-log.txt
213213

214214
#Mr Developer
215215
.mr.developer.cfg
216+
217+
Makefile
218+
Makefile.in
219+
aclocal.m4
220+
autom4te.cache/*
221+
config.h
222+
config.h.in
223+
config.status
224+
configure
225+
depcomp
226+
install-sh
227+
missing
228+
stamp-h1

LICENSE.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ win32
4040
--------------
4141

4242
With the exception of the files contained in the directories
43-
`/win32/N3888_RefImpl/DLLs`, `/win32/N3888_RefImpl/include`, and
44-
`/win32/N3888_RefImpl/libs`, the following license applies to the files contained
45-
in the `/win32` directory.
43+
`/N3888_RefImpl/src/win32/DLLs`, `/N3888_RefImpl/src/win32/include`, and
44+
`/N3888_RefImpl/src/win32/libs`, the following license applies to the files contained
45+
in the `/N3888_RefImpl` directory.
4646

4747

4848
`The MIT License (MIT)
@@ -67,11 +67,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
6767
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.`
6868

6969

70-
The files in `/win32/N3888_RefImpl/include` are header files used to interface
70+
The files in `/N3888_RefImpl/src/win32/include` are header files used to interface
7171
with the cairo graphics library. Their license is described above under the **cairo**
7272
section.
7373

74-
The files in `/win32/N3888_RefImpl/libs` are .lib files used to dynamically
74+
The files in `/N3888_RefImpl/src/win32/libs` are .lib files used to dynamically
7575
link with:
7676

7777
* The cairo graphics library in accordance with the terms of the Mozilla
@@ -80,7 +80,7 @@ link with:
8080
* The zlib general purpose compression library in accordance with the terms
8181
of its license, which can be found at `/zlib-1.2.8/zlib.h`.
8282

83-
The files in `/win32/N3888_RefImpl/DLLs` are executable code versions of
83+
The files in `/N3888_RefImpl/src/win32/DLLs` are executable code versions of
8484
cairo and zlib in the form of DLL files. These files were built in accordance
85-
with the instructions provided at `/win32/N3888_RefImpl/DLL build instructions.txt`.
85+
with the instructions provided at `/N3888_RefImpl/src/win32/DLL build instructions.txt`.
8686
Their licensing is as described above for the .lib files.

Makefile.am

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
SUBDIRS = N3888_RefImpl
2+
ACLOCAL_AMFLAGS = -I m4
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,5 @@
4242
/N3888_RefImpl/x64/Debug/N3888_RefImpl.pch
4343
/N3888_RefImpl/x64/Debug/N3888_RefImpl.res
4444
/N3888_RefImpl/x64/Debug/vc120.idb
45+
Makefile
46+
Makefile.in

N3888_RefImpl/Makefile.am

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
SUBDIRS = src
2+
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 2013
44
VisualStudioVersion = 12.0.21005.1
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "N3888_RefImpl", "N3888_RefImpl\N3888_RefImpl.vcxproj", "{1B3FB96B-B90D-40B7-B0D9-20D15BE707B8}"
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "N3888_RefImpl", "src\N3888_RefImpl.vcxproj", "{1B3FB96B-B90D-40B7-B0D9-20D15BE707B8}"
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution

N3888_RefImpl/src/.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/.deps/*
2+
/Makefile.in
3+
/N3888_RefImpl
4+
/N3888_RefImpl-*.o
5+
/Makefile

N3888_RefImpl/src/Makefile.am

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
bin_PROGRAMS = N3888_RefImpl
2+
N3888_RefImpl_SOURCES = entrypoint-gtk.cpp signals.cpp context.cpp device.cpp drawing_exception.cpp font_face.cpp font_options.cpp gradient_pattern.cpp image_surface.cpp linear_pattern.cpp matrix.cpp mesh_pattern.cpp pattern.cpp radial_pattern.cpp raster_source_pattern.cpp region.cpp sample_draw.cpp scaled_font.cpp solid_color_pattern.cpp standalone_functions.cpp surface.cpp toy_font_face.cpp user_data_key.cpp
3+
N3888_RefImpl_LDADD = @GTKCAIRO_LIBS@
4+
N3888_RefImpl_CPPFLAGS = @GTKCAIRO_CFLAGS@ # -fpermissive
5+
6+
#if ! [ [ test "$CXX" = "g++" ] || [ test "$CXX" = "gcc" ] ]]
7+
#then
8+
# N3888_RefImpl_LDADD += -fpermissive
9+
#fi

0 commit comments

Comments
 (0)