32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
--- ois-v1-3/demos/Makefile.am 2010-04-01 05:06:55.000000000 +0200
|
|
+++ patched/demos/Makefile.am 2013-06-09 03:09:20.343150413 +0200
|
|
@@ -1,11 +1,25 @@
|
|
-INCLUDES = $(STLPORT_CFLAGS) -I$(top_srcdir)/includes $(CFLAGS) -I/usr/X11R6/include
|
|
+if PLATFORM_LINUX
|
|
+AM_CPPFLAGS = $(STLPORT_CFLAGS) -I$(top_srcdir)/includes $(CFLAGS) -I/usr/X11R6/include
|
|
+endif
|
|
+
|
|
+if PLATFORM_WIN32
|
|
+AM_CPPFLAGS = $(STLPORT_CFLAGS) -I$(top_srcdir)/includes -I$(top_srcdir)/Win32/CommandLine $(CFLAGS)
|
|
+endif
|
|
|
|
noinst_PROGRAMS = ConsoleApp FFConsoleTest
|
|
|
|
-ConsoleApp_SOURCES = OISConsole.cpp
|
|
+ConsoleApp_SOURCES = OISConsole.cpp $(top_srcdir)/Win32/CommandLine/CommandLine.rc
|
|
ConsoleApp_LDFLAGS = -L$(top_builddir)/src
|
|
+if PLATFORM_WIN32
|
|
+ConsoleApp_LDADD = -lOIS -ldinput8 -ldxguid -lole32 -loleaut32 -luser32
|
|
+else
|
|
ConsoleApp_LDADD = -lOIS
|
|
+endif
|
|
|
|
-FFConsoleTest_SOURCES = FFConsoleDemo.cpp
|
|
+FFConsoleTest_SOURCES = FFConsoleDemo.cpp $(top_srcdir)/Win32/DemoFFTest/FF.rc
|
|
FFConsoleTest_LDFLAGS = -L$(top_builddir)/src
|
|
+if PLATFORM_WIN32
|
|
+FFConsoleTest_LDADD = -lOIS -ldinput8 -ldxguid -lole32 -loleaut32 -luser32
|
|
+else
|
|
FFConsoleTest_LDADD = -lOIS
|
|
+endif
|