6345c35592
* Changed required.plist version parsing to treat version strings as series of integers separated by points. This allows: - correct parsing of bug-fix versions like 1.67.1 - correctly sorting 1.100 after 1.99. * Deleted just about all commented-out NSLog()s (several hundred), and some other commented-out code. (commented-out or #ifdefed-out code with no indication of when you might want to reinstate it is worse than useless.) * Ensured that most NSLog()s will at least include their class/module in their message class. * Renamed Universe's -recycledOrNew:, -getShipWithRole: and -getShip: to -allocRecycledOrNewEntity:, -newShipWithRole: and -newShipWithName: to better match Objective-C coding conventions. (Methods whose result needs releasing should always be called alloc*, copy*, retain* or new*.) * Replaced -[Universe generateSystemDescription] with DescriptionForSystem(). * Replaced -[Universe getRandomDigrams] with RandomDigrams(). * Replaced +[Universe systemSeedString] with StringFromRandomSeed(). * Replaced [Universe entityZero] with [PlayerEntity sharedPlayer]. * Replaced scriptedUniverse in ScriptEngine with [Universe sharedUniverse]. * Removed HAVE_SOUND. If you're porting to a platform without sound, use a no-op implementation of OOSound. * Removed all (commented-out) NSBeep()s. * Made settings caching in OOLog actually work. Doing complete message class setting resolution every time OOLog() was called was around 2% of our per-frame cost. (With this fixed, cache hit rate is well over 99% after a few seconds of play.) *headdesk* (It may also be worth moving the settings-check into the macro, to avoid evaluating parameters for log messages that are never seen, but this might cause obscure bugs due to the parameters having side effects.) Stuff that should have been in revision 859: * Replaced all occurrences of -[Universe expandDescription:forSystem:] with ExpandDescriptionForSeed() and ExpandDescriptionForCurrentSystem(). * Replaced -[Universe expandDescriptionWithLocals:forSystem:withLocalVariables:] with ExpandDescriptionsWithLocalsForSystemSeed() and ExpandDescriptionsWithLocalsForCurrentSystem(). git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@872 127b21dd-08f5-0310-b4b7-95ae10353056
28 lines
2.2 KiB
Makefile
28 lines
2.2 KiB
Makefile
include $(GNUSTEP_MAKEFILES)/common.make
|
|
CP = cp
|
|
vpath %.m src/SDL:src/Core:src/Core/JavaScript
|
|
vpath %.h src/SDL:src/Core
|
|
vpath %.c src/SDL:src/Core:src/BSDCompat
|
|
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_USER_ROOT)
|
|
ifeq ($(GNUSTEP_HOST_OS),mingw32)
|
|
ADDITIONAL_INCLUDE_DIRS = -Ideps/Windows-x86-deps/include
|
|
ADDITIONAL_OBJC_LIBS = -lglu32 -lopengl32 -lmingw32 -lSDLmain -lSDL -lSDL_mixer -lSDL_image -lgnustep-base -ljs32
|
|
ADDITIONAL_CFLAGS = -DLINUX -DWIN32 -DNEED_STRLCPY `sdl-config --cflags`
|
|
# note the vpath stuff above isn't working for me, so adding src/SDL and src/Core explicitly
|
|
ADDITIONAL_OBJCFLAGS = -DLOADSAVEGUI -DLINUX -DWIN32 -DXP_WIN -Wno-import `sdl-config --cflags` -Isrc/SDL -Isrc/Core -Isrc/Core/JavaScript
|
|
oolite_LIB_DIRS += -L$(GNUSTEP_LOCAL_ROOT)/lib -Ldeps/Windows-x86-deps/lib
|
|
else
|
|
ADDITIONAL_INCLUDE_DIRS = -Isrc/SDL -Isrc/Core -Isrc/BSDCompat
|
|
ADDITIONAL_OBJC_LIBS = -lGLU -lGL -lSDL -lpthread -lSDL_mixer -lSDL_image -lgnustep-base
|
|
ADDITIONAL_CFLAGS = -DLINUX -DNEED_STRLCPY `sdl-config --cflags`
|
|
ADDITIONAL_OBJCFLAGS = -DLOADSAVEGUI -DLINUX -Wno-import `sdl-config --cflags`
|
|
oolite_LIB_DIRS += -L/usr/X11R6/lib/
|
|
endif
|
|
OBJC_PROGRAM_NAME = oolite
|
|
|
|
oolite_C_FILES = legacy_random.c strlcpy.c
|
|
oolite_OBJC_FILES = Comparison.m AI.m DustEntity.m Entity.m GameController.m GuiDisplayGen.m HeadUpDisplay.m main.m MyOpenGLView.m OpenGLSprite.m ParticleEntity.m PlanetEntity.m PlayerEntityScripting.m PlayerEntityContracts.m PlayerEntityControls.m PlayerEntityLoadSave.m PlayerEntitySound.m PlayerEntity.m ResourceManager.m RingEntity.m ShipEntityAI.m ShipEntity.m SkyEntity.m StationEntity.m TextureStore.m Universe.m OOSound.m SDLMusic.m SDLImage.m NSFileManagerOOExtensions.m JoystickHandler.m PlayerEntityStickMapper.m OOBasicSoundReferencePoint.m OOBasicSoundSource.m OOCharacter.m OOTrumble.m WormholeEntity.m NSScannerOOExtensions.m OOXMLExtensions.m NSMutableDictionaryOOExtensions.m Geometry.m Octree.m CollisionRegion.m OOColor.m ScriptCompiler.m StringTokeniser.m OOLogging.m OOCacheManager.m OOCache.m OXPScript.m ScriptEngine.m OOStringParsing.m OOCollectionExtractors.m OOVector.m OOMatrix.m OOQuaternion.m OOVoxel.m OOTriangle.m OOPListParsing.m OOFastArithmetic.m OOTextureScaling.m
|
|
|
|
include $(GNUSTEP_MAKEFILES)/objc.make
|
|
include GNUmakefile.postamble
|