Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2985 in orxonox.OLD for orxonox/branches/osX/src


Ignore:
Timestamp:
Nov 25, 2004, 3:08:36 PM (20 years ago)
Author:
nico
Message:

orxonox/branches/osX: compiling on osX now

Location:
orxonox/branches/osX/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/osX/src/Makefile.in

    r2983 r2985  
    1 # Makefile.in generated by automake 1.8.5 from Makefile.am.
     1# Makefile.in generated by automake 1.7.6 from Makefile.am.
    22# @configure_input@
    33
    4 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
    5 # 2003, 2004  Free Software Foundation, Inc.
     4# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
     5# Free Software Foundation, Inc.
    66# This Makefile.in is free software; the Free Software Foundation
    77# gives unlimited permission to copy and/or distribute it,
    … …  
    1414
    1515@SET_MAKE@
    16 
    17 
    18 SOURCES = $(orxonox_SOURCES)
    1916
    2017srcdir = @srcdir@
    … …  
    2522pkgincludedir = $(includedir)/@PACKAGE@
    2623top_builddir = ..
     24
    2725am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
    2826INSTALL = @INSTALL@
    … …  
    3937POST_UNINSTALL = :
    4038host_triplet = @host@
    41 bin_PROGRAMS = orxonox$(EXEEXT)
    42 subdir = src
    43 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
    44         $(srcdir)/Makefile.in INSTALL
    45 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    46 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
    47 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    48         $(ACLOCAL_M4)
    49 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
    50 CONFIG_HEADER = $(top_builddir)/config.h
    51 CONFIG_CLEAN_FILES =
    52 am__installdirs = "$(DESTDIR)$(bindir)"
    53 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    54 PROGRAMS = $(bin_PROGRAMS)
    55 am_orxonox_OBJECTS = orxonox.$(OBJEXT) world.$(OBJEXT) \
    56         player.$(OBJEXT) data_tank.$(OBJEXT) world_entity.$(OBJEXT) \
    57         vector.$(OBJEXT) camera.$(OBJEXT) collision.$(OBJEXT) \
    58         command_node.$(OBJEXT) ini_parser.$(OBJEXT) keynames.$(OBJEXT) \
    59         track.$(OBJEXT) base_entity.$(OBJEXT) game_loader.$(OBJEXT) \
    60         campaign.$(OBJEXT) story_entity.$(OBJEXT) object.$(OBJEXT) \
    61         environment.$(OBJEXT) array.$(OBJEXT) material.$(OBJEXT) \
    62         list.$(OBJEXT)
    63 orxonox_OBJECTS = $(am_orxonox_OBJECTS)
    64 orxonox_LDADD = $(LDADD)
    65 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    66 depcomp = $(SHELL) $(top_srcdir)/depcomp
    67 am__depfiles_maybe = depfiles
    68 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/array.Po \
    69 @AMDEP_TRUE@    ./$(DEPDIR)/base_entity.Po ./$(DEPDIR)/camera.Po \
    70 @AMDEP_TRUE@    ./$(DEPDIR)/campaign.Po ./$(DEPDIR)/collision.Po \
    71 @AMDEP_TRUE@    ./$(DEPDIR)/command_node.Po \
    72 @AMDEP_TRUE@    ./$(DEPDIR)/data_tank.Po \
    73 @AMDEP_TRUE@    ./$(DEPDIR)/environment.Po \
    74 @AMDEP_TRUE@    ./$(DEPDIR)/game_loader.Po \
    75 @AMDEP_TRUE@    ./$(DEPDIR)/ini_parser.Po ./$(DEPDIR)/keynames.Po \
    76 @AMDEP_TRUE@    ./$(DEPDIR)/list.Po ./$(DEPDIR)/material.Po \
    77 @AMDEP_TRUE@    ./$(DEPDIR)/object.Po ./$(DEPDIR)/orxonox.Po \
    78 @AMDEP_TRUE@    ./$(DEPDIR)/player.Po ./$(DEPDIR)/story_entity.Po \
    79 @AMDEP_TRUE@    ./$(DEPDIR)/track.Po ./$(DEPDIR)/vector.Po \
    80 @AMDEP_TRUE@    ./$(DEPDIR)/world.Po ./$(DEPDIR)/world_entity.Po
    81 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    82         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    83 CXXLD = $(CXX)
    84 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    85         -o $@
    86 SOURCES = $(orxonox_SOURCES)
    87 DIST_SOURCES = $(orxonox_SOURCES)
    88 HEADERS = $(noinst_HEADERS)
    89 ETAGS = etags
    90 CTAGS = ctags
    91 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    9239ACLOCAL = @ACLOCAL@
    9340AMDEP_FALSE = @AMDEP_FALSE@
    … …  
    174121localstatedir = @localstatedir@
    175122mandir = @mandir@
    176 mkdir_p = @mkdir_p@
    177123oldincludedir = @oldincludedir@
    178124prefix = @prefix@
    … …  
    188134AM_CXXFLAGS = "-I/usr/X11R6/include"
    189135AM_LDFLAGS = "-L/usr/Mesa-6.0.1/lib  -L/usr/X11R6/lib -lXt -lX11" $(MWINDOWS)
     136
     137
     138#"-O3 -pedantic -fPIC -ffast-math -I/usr/X11R6/include"
     139bin_PROGRAMS = orxonox
     140
    190141orxonox_SOURCES = orxonox.cc world.cc player.cc data_tank.cc world_entity.cc vector.cc camera.cc collision.cc command_node.cc ini_parser.cc keynames.cc track.cc base_entity.cc game_loader.cc campaign.cc story_entity.cc object.cc environment.cc array.cc material.cc list.cc
    191142noinst_HEADERS = ability.h data_tank.h npc.h stdincl.h ai.h environment.h orxonox.h synchronisable.h base_entity.h error.h player.h track.h camera.h ini_parser.h power_up.h vector.h collision.h keynames.h proto_class.h world.h command_node.h list.h shoot_laser.h world_entity.h coordinates.h message_structures.h shoot_rocket.h object.h array.h material.h list_template.h
     143subdir = src
     144ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     145mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
     146CONFIG_HEADER = $(top_builddir)/config.h
     147CONFIG_CLEAN_FILES =
     148bin_PROGRAMS = orxonox$(EXEEXT)
     149PROGRAMS = $(bin_PROGRAMS)
     150
     151am_orxonox_OBJECTS = orxonox.$(OBJEXT) world.$(OBJEXT) player.$(OBJEXT) \
     152        data_tank.$(OBJEXT) world_entity.$(OBJEXT) vector.$(OBJEXT) \
     153        camera.$(OBJEXT) collision.$(OBJEXT) command_node.$(OBJEXT) \
     154        ini_parser.$(OBJEXT) keynames.$(OBJEXT) track.$(OBJEXT) \
     155        base_entity.$(OBJEXT) game_loader.$(OBJEXT) campaign.$(OBJEXT) \
     156        story_entity.$(OBJEXT) object.$(OBJEXT) environment.$(OBJEXT) \
     157        array.$(OBJEXT) material.$(OBJEXT) list.$(OBJEXT)
     158orxonox_OBJECTS = $(am_orxonox_OBJECTS)
     159orxonox_LDADD = $(LDADD)
     160orxonox_DEPENDENCIES =
     161orxonox_LDFLAGS =
     162
     163DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
     164depcomp = $(SHELL) $(top_srcdir)/depcomp
     165am__depfiles_maybe = depfiles
     166@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/array.Po ./$(DEPDIR)/base_entity.Po \
     167@AMDEP_TRUE@    ./$(DEPDIR)/camera.Po ./$(DEPDIR)/campaign.Po \
     168@AMDEP_TRUE@    ./$(DEPDIR)/collision.Po \
     169@AMDEP_TRUE@    ./$(DEPDIR)/command_node.Po \
     170@AMDEP_TRUE@    ./$(DEPDIR)/data_tank.Po ./$(DEPDIR)/environment.Po \
     171@AMDEP_TRUE@    ./$(DEPDIR)/game_loader.Po \
     172@AMDEP_TRUE@    ./$(DEPDIR)/ini_parser.Po ./$(DEPDIR)/keynames.Po \
     173@AMDEP_TRUE@    ./$(DEPDIR)/list.Po ./$(DEPDIR)/material.Po \
     174@AMDEP_TRUE@    ./$(DEPDIR)/object.Po ./$(DEPDIR)/orxonox.Po \
     175@AMDEP_TRUE@    ./$(DEPDIR)/player.Po ./$(DEPDIR)/story_entity.Po \
     176@AMDEP_TRUE@    ./$(DEPDIR)/track.Po ./$(DEPDIR)/vector.Po \
     177@AMDEP_TRUE@    ./$(DEPDIR)/world.Po ./$(DEPDIR)/world_entity.Po
     178CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
     179        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
     180CXXLD = $(CXX)
     181CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
     182        -o $@
     183DIST_SOURCES = $(orxonox_SOURCES)
     184HEADERS = $(noinst_HEADERS)
     185
     186DIST_COMMON = $(noinst_HEADERS) INSTALL Makefile.am Makefile.in
     187SOURCES = $(orxonox_SOURCES)
     188
    192189all: all-am
    193190
    194191.SUFFIXES:
    195192.SUFFIXES: .cc .o .obj
    196 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    197         @for dep in $?; do \
    198           case '$(am__configure_deps)' in \
    199             *$$dep*) \
    200               cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
    201                 && exit 0; \
    202               exit 1;; \
    203           esac; \
    204         done; \
    205         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
     193$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
    206194        cd $(top_srcdir) && \
    207195          $(AUTOMAKE) --gnu  src/Makefile
    208 .PRECIOUS: Makefile
    209 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    210         @case '$?' in \
    211           *config.status*) \
    212             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
    213           *) \
    214             echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
    215             cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
    216         esac;
    217 
    218 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
    219         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    220 
    221 $(top_srcdir)/configure:  $(am__configure_deps)
    222         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    223 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
    224         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
     196Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
     197        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
     198binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    225199install-binPROGRAMS: $(bin_PROGRAMS)
    226200        @$(NORMAL_INSTALL)
    227         test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
     201        $(mkinstalldirs) $(DESTDIR)$(bindir)
    228202        @list='$(bin_PROGRAMS)'; for p in $$list; do \
    229203          p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
    … …  
    231205          ; then \
    232206            f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
    233            echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
    234            $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
     207           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
     208           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
    235209          else :; fi; \
    236210        done
    … …  
    240214        @list='$(bin_PROGRAMS)'; for p in $$list; do \
    241215          f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
    242           echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
    243           rm -f "$(DESTDIR)$(bindir)/$$f"; \
     216          echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
     217          rm -f $(DESTDIR)$(bindir)/$$f; \
    244218        done
    245219
    … …  
    251225
    252226mostlyclean-compile:
    253         -rm -f *.$(OBJEXT)
     227        -rm -f *.$(OBJEXT) core *.core
    254228
    255229distclean-compile:
    … …  
    278252@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/world_entity.Po@am__quote@
    279253
     254distclean-depend:
     255        -rm -rf ./$(DEPDIR)
     256
    280257.cc.o:
    281 @am__fastdepCXX_TRUE@   if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
    282 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
     258@am__fastdepCXX_TRUE@   if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
     259@am__fastdepCXX_TRUE@     -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
     260@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
     261@am__fastdepCXX_TRUE@   else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
     262@am__fastdepCXX_TRUE@   fi
    283263@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    284264@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
    285265@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    286 @am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ $<
     266@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
    287267
    288268.cc.obj:
    289 @am__fastdepCXX_TRUE@   if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
    290 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
     269@am__fastdepCXX_TRUE@   if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
     270@am__fastdepCXX_TRUE@     -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
     271@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
     272@am__fastdepCXX_TRUE@   else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
     273@am__fastdepCXX_TRUE@   fi
    291274@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    292275@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
    293276@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    294 @am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
     277@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
    295278uninstall-info-am:
     279
     280ETAGS = etags
     281ETAGSFLAGS =
     282
     283CTAGS = ctags
     284CTAGSFLAGS =
     285
     286tags: TAGS
    296287
    297288ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
    … …  
    303294               END { for (i in files) print i; }'`; \
    304295        mkid -fID $$unique
    305 tags: TAGS
    306296
    307297TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    … …  
    315305          $(AWK) '    { files[$$0] = 1; } \
    316306               END { for (i in files) print i; }'`; \
    317         if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
    318           test -n "$$unique" || unique=$$empty_fix; \
    319           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
    320             $$tags $$unique; \
    321         fi
     307        test -z "$(ETAGS_ARGS)$$tags$$unique" \
     308          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     309             $$tags $$unique
     310
    322311ctags: CTAGS
    323312CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    … …  
    342331distclean-tags:
    343332        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
     333DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
     334
     335top_distdir = ..
     336distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
    344337
    345338distdir: $(DISTFILES)
    … …  
    355348          if test "$$dir" != "$$file" && test "$$dir" != "."; then \
    356349            dir="/$$dir"; \
    357             $(mkdir_p) "$(distdir)$$dir"; \
     350            $(mkinstalldirs) "$(distdir)$$dir"; \
    358351          else \
    359352            dir=''; \
    … …  
    373366check: check-am
    374367all-am: Makefile $(PROGRAMS) $(HEADERS)
     368
    375369installdirs:
    376         for dir in "$(DESTDIR)$(bindir)"; do \
    377           test -z "$$dir" || $(mkdir_p) "$$dir"; \
    378         done
     370        $(mkinstalldirs) $(DESTDIR)$(bindir)
    379371install: install-am
    380372install-exec: install-exec-am
    … …  
    388380install-strip:
    389381        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
    390           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
     382          INSTALL_STRIP_FLAG=-s \
    391383          `test -z '$(STRIP)' || \
    392384            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
    … …  
    396388
    397389distclean-generic:
    398         -rm -f $(CONFIG_CLEAN_FILES)
     390        -rm -f Makefile $(CONFIG_CLEAN_FILES)
    399391
    400392maintainer-clean-generic:
    … …  
    406398
    407399distclean: distclean-am
    408         -rm -rf ./$(DEPDIR)
    409         -rm -f Makefile
    410 distclean-am: clean-am distclean-compile distclean-generic \
    411         distclean-tags
     400
     401distclean-am: clean-am distclean-compile distclean-depend \
     402        distclean-generic distclean-tags
    412403
    413404dvi: dvi-am
    … …  
    415406dvi-am:
    416407
    417 html: html-am
    418 
    419408info: info-am
    420409
    … …  
    432421
    433422maintainer-clean: maintainer-clean-am
    434         -rm -rf ./$(DEPDIR)
    435         -rm -f Makefile
     423
    436424maintainer-clean-am: distclean-am maintainer-clean-generic
    437425
    … …  
    452440.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
    453441        clean-generic ctags distclean distclean-compile \
    454         distclean-generic distclean-tags distdir dvi dvi-am html \
    455         html-am info info-am install install-am install-binPROGRAMS \
     442        distclean-depend distclean-generic distclean-tags distdir dvi \
     443        dvi-am info info-am install install-am install-binPROGRAMS \
    456444        install-data install-data-am install-exec install-exec-am \
    457445        install-info install-info-am install-man install-strip \

  • orxonox/branches/osX/src/keynames.cc

    r2551 r2985  
    1313   co-programmer: ...
    1414*/
    15 #include <SDL/SDL.h>
    1615
    1716#include "keynames.h"

  • orxonox/branches/osX/src/keynames.h

    r2551 r2985  
    1010#endif
    1111
    12 #include <SDL/SDL.h>
     12#include <SDL.h>
    1313
    1414/**

  • orxonox/branches/osX/src/orxonox.h

    r2636 r2985  
    66#ifndef ORXONOX_H
    77#define ORXONOX_H
    8 
    9 #include <SDL/SDL.h>
    108
    119#include "stdincl.h"

  • orxonox/branches/osX/src/stdincl.h

    r2816 r2985  
    88#include <windows.h>
    99#endif
    10 #include <SDL/SDL.h>
     10#include <SDL.h>
    1111#include <GL/gl.h>
    1212#include <GL/glu.h>
Note: See TracChangeset for help on using the changeset viewer.