Skip to content

Commit 9b6e183

Browse files
posixninjaposixninja
committed
Testing out some things
1 parent 01a2d3e commit 9b6e183

File tree

4 files changed

+45
-26
lines changed

4 files changed

+45
-26
lines changed

‎.cproject

+16-5
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,21 @@
1414
</extensions>
1515
</storageModule>
1616
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
17-
<configuration artifactName="${ProjName}" buildProperties="" id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.1699467783" name="Build (GNU)" parent="org.eclipse.cdt.build.core.emptycfg">
17+
<configuration artifactName="${ProjName}" buildProperties="" description="" id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.1699467783" name="Build (GNU)" parent="org.eclipse.cdt.build.core.emptycfg">
1818
<folderInfo id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.1699467783.323770005" name="/" resourcePath="">
1919
<toolChain id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.1412416765" name="GNU Autotools Toolchain" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolChain">
2020
<targetPlatform id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.targetPlatform.34806326" isAbstract="false" name="GNU Autotools Target Platform" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.targetPlatform"/>
21-
<builder id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder.365209551" managedBuildOn="false" name="null.Build (GNU)" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder"/>
22-
<tool id="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure.295730809" name="configure" superClass="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure"/>
21+
<builder id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder.365209551" keepEnvironmentInBuildfile="false" managedBuildOn="false" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder"/>
22+
<tool id="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure.295730809" name="configure" superClass="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure">
23+
<option id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.name.130293320" superClass="org.eclipse.linuxtools.cdt.autotools.core.option.configure.name" value="org.eclipse.linuxtools.cdt.autotools.core.toolChain.1699467783" valueType="string"/>
24+
</tool>
2325
<tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.autogen.667906696" name="autogen.sh" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.autogen"/>
24-
<tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc.740101074" name="GCC C Compiler" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc"/>
26+
<tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc.740101074" name="GCC C Compiler" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc">
27+
<option id="gnu.c.compiler.option.include.paths.1016878732" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
28+
<listOptionValue builtIn="false" value="/opt/local/include"/>
29+
</option>
30+
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1871681871" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
31+
</tool>
2532
<tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gpp.159439863" name="GCC C++ Compiler" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gpp"/>
2633
</toolChain>
2734
</folderInfo>
@@ -33,8 +40,12 @@
3340
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
3441
<project id="libdmg-1.null.416019863" name="libdmg-1"/>
3542
</storageModule>
43+
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
44+
<storageModule moduleId="refreshScope"/>
3645
<storageModule moduleId="scannerConfiguration">
3746
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
47+
<scannerConfigBuildInfo instanceId="org.eclipse.linuxtools.cdt.autotools.core.toolChain.1699467783;org.eclipse.linuxtools.cdt.autotools.core.toolChain.1699467783.323770005;org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc.740101074;cdt.managedbuild.tool.gnu.c.compiler.input.1871681871">
48+
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
49+
</scannerConfigBuildInfo>
3850
</storageModule>
39-
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
4051
</cproject>

‎configure.ac

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ dnl Check if Libtool is present
2222
dnl Libtool is used for building share libraries
2323
AC_PROG_LIBTOOL
2424

25+
PKG_CHECK_MODULES(zlib, zlib >= 1.2)
2526
PKG_CHECK_MODULES(plist, libplist >= 1.0)
2627
PKG_CHECK_MODULES(crippy, libcrippy-1.0 >= 1.0)
2728
PKG_CHECK_MODULES(hfsplus, libhfsplus-1.0 >= 1.0)

‎src/Makefile.am

+15-11
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
1-
AM_CFLAGS = -I./include -I../include \
2-
$(libcrippy_CFLAGS) \
3-
$(libhfsplus_CFLAGS) \
4-
$(libplist_CFLAGS)
1+
AM_CFLAGS = -I$(top_srcdir)/include \
2+
$(crippy_CFLAGS) \
3+
$(hfsplus_CFLAGS) \
4+
$(plist_CFLAGS) \
5+
$(zlib_CFLAGS) \
6+
-arch i386 -arch x86_64
57

6-
AM_LDFLAGS = $(libcrippy_LIBS) \
7-
$(libhfsplus_LIBS) \
8-
$(libplist_LIBS)
8+
AM_LDFLAGS = $(crippy_LIBS) \
9+
$(hfsplus_LIBS) \
10+
$(plist_LIBS) \
11+
$(zlib_LIBS) \
12+
-arch i386 -arch x86_64
913

1014
lib_LTLIBRARIES = libdmg-1.0.la
11-
15+
libdmg_1_0_la_CFLAGS = $(AM_CFLAGS)
16+
libdmg_1_0_la_LDFLAGS = $(AM_LDFLAGS)
1217
libdmg_1_0_la_SOURCES = libdmg.c \
1318
abstractfile.c \
1419
base64.c \
1520
checksum.c \
1621
dmgfile.c \
22+
dmglib.c \
1723
filevault.c \
1824
io.c \
1925
partition.c \
2026
udif.c
21-
22-
libdmg_1_0_la_CFLAGS = $(AM_CFLAGS)
23-
libdmg_1_0_la_LDFLAGS = $(AM_LDFLAGS)
27+

‎tools/Makefile.am

+13-10
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1-
AM_CFLAGS = -I./include -I../include \
2-
$(libplist_CFLAGS) \
3-
$(libhfsplus_CFLAGS) \
4-
$(libcrippy_CFLAGS)
1+
AM_CFLAGS = -I$(top_srcdir)/include \
2+
$(plist_CFLAGS) \
3+
$(hfsplus_CFLAGS) \
4+
$(crippy_CFLAGS) \
5+
$(zlib_CFLAGS) \
6+
-arch i386 -arch x86_64
57

6-
AM_LDFLAGS = $(libplist_LIBS) \
7-
$(libhfsplus_LIBS) \
8-
$(libcrippy_LIBS)
8+
AM_LDFLAGS = $(plist_LIBS) \
9+
$(hfsplus_LIBS) \
10+
$(crippy_LIBS) \
11+
$(zlib_LIBS) \
12+
-arch i386 -arch x86_64
913

1014
bin_PROGRAMS = dmg
1115

1216
dmg_SOURCES = dmg.c
13-
14-
dmg_LDADD = libdmg-1.0.la
1517
dmg_CFLAGS = $(AM_CFLAGS)
16-
dmg_LDFLAGS = $(AM_LDFLAGS)
18+
dmg_LDFLAGS = $(AM_LDFLAGS)
19+
dmg_LDADD = $(top_srcdir)/src/libdmg-1.0.la

0 commit comments

Comments
 (0)