Quellcode durchsuchen

More Linux fixes

Ivan Safrin vor 14 Jahren
Ursprung
Commit
fad1e8c03f
4 geänderte Dateien mit 4 neuen und 4 gelöschten Zeilen
  1. 1 1
      Core/Build/Linux/Makefile
  2. 1 1
      Core/Build/Linux/Makefile.am
  3. 1 1
      Core/Build/Linux/Makefile.in
  4. 1 1
      Examples/C++/Makefile

+ 1 - 1
Core/Build/Linux/Makefile

@@ -335,7 +335,7 @@ top_build_prefix =
 top_builddir = .
 top_builddir = .
 top_srcdir = .
 top_srcdir = .
 AUTOMAKE_OPTIONS = foreign
 AUTOMAKE_OPTIONS = foreign
-AM_CPPFLAGS = -02 -DGL_GLEXT_PROTOTYPES -I../../Contents/Include -I/usr/local/include/freetype2 -I/usr/local/include/AL
+AM_CPPFLAGS = -O2 -DGL_GLEXT_PROTOTYPES -I../../Contents/Include `freetype-config --cflags`
 lib_LTLIBRARIES = libPolyCore.la
 lib_LTLIBRARIES = libPolyCore.la
 libPolyCore_la_SOURCES = ../../Contents/Source/OSBasics.cpp \
 libPolyCore_la_SOURCES = ../../Contents/Source/OSBasics.cpp \
 	../../Contents/Source/PolyBezierCurve.cpp \
 	../../Contents/Source/PolyBezierCurve.cpp \

Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
Core/Build/Linux/Makefile.am


+ 1 - 1
Core/Build/Linux/Makefile.in

@@ -335,7 +335,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
 AUTOMAKE_OPTIONS = foreign
-AM_CPPFLAGS = -02 -DGL_GLEXT_PROTOTYPES -I../../Contents/Include -I/usr/local/include/freetype2 -I/usr/local/include/AL
+AM_CPPFLAGS = -O2 -DGL_GLEXT_PROTOTYPES -I../../Contents/Include `freetype-config --cflags`
 lib_LTLIBRARIES = libPolyCore.la
 lib_LTLIBRARIES = libPolyCore.la
 libPolyCore_la_SOURCES = ../../Contents/Source/OSBasics.cpp \
 libPolyCore_la_SOURCES = ../../Contents/Source/OSBasics.cpp \
 	../../Contents/Source/PolyBezierCurve.cpp \
 	../../Contents/Source/PolyBezierCurve.cpp \

+ 1 - 1
Examples/C++/Makefile

@@ -1,2 +1,2 @@
 default:
 default:
-	g++ -g -I/usr/local/include/freetype2 -I/usr/local/include/AL -IBasicImage -lPolyCore BasicImage/HelloPolycodeApp.cpp BasicImage/main.cpp -o basic_image
+	g++ -g `freetype-config --cflags` -IBasicImage -lPolyCore BasicImage/HelloPolycodeApp.cpp BasicImage/main.cpp -o basic_image

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.