-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #339 from GarageGames/development
Torque 2D 3.3!
- Loading branch information
Showing
92 changed files
with
5,116 additions
and
1,277 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| # I release this sample under the MIT license: free for any use, provided | ||
| # you hold me harmless from any such use you make, and you retain my | ||
| # copyright on the actual sources. | ||
| # Copyright 2005 Jon Watte. | ||
|
|
||
| LIBNAME := ogg | ||
| SOURCES := \ | ||
| ../../lib/libogg/src/bitwise.c \ | ||
| ../../lib/libogg/src/framing.c \ | ||
|
|
||
| LDFLAGS_ogg := -g -m32 | ||
|
|
||
| CFLAGS_ogg := -MMD -I. -m32 -msse -mmmx -march=i686 | ||
|
|
||
| CFLAGS_ogg += -I../../lib/libogg/include | ||
|
|
||
| CFLAGS_ogg += -DUNICODE | ||
| CFLAGS_ogg += -DLINUX | ||
|
|
||
| CFLAGS_DEBUG_ogg := $(CFLAGS_ogg) -ggdb | ||
| CFLAGS_DEBUG_ogg += -DTORQUE_DEBUG | ||
| CFLAGS_DEBUG_ogg += -DTORQUE_DEBUG_GUARD | ||
| CFLAGS_DEBUG_ogg += -DTORQUE_NET_STATS | ||
|
|
||
| CFLAGS_ogg += -O3 | ||
|
|
||
| CC := gcc | ||
| LD := gcc | ||
|
|
||
| TARGET_ogg := lib/libogg.a | ||
| TARGET_ogg_DEBUG := lib/libogg_DEBUG.a | ||
|
|
||
| LIB_TARGETS += $(TARGET_ogg) | ||
| LIB_TARGETS_DEBUG += $(TARGET_ogg_DEBUG) | ||
|
|
||
| OBJS_ogg := $(patsubst ../../lib/libogg/%,Release/ogg/%.o,$(SOURCES)) | ||
| OBJS_ogg_DEBUG := $(patsubst ../../lib/libogg/%,Debug/ogg/%.o,$(SOURCES)) | ||
|
|
||
| # Deriving the variable name from the target name is the secret sauce | ||
| # of the build system. | ||
| # | ||
| $(TARGET_ogg): $(OBJS_ogg) | ||
| @mkdir -p $(dir $@) | ||
| ar cr $@ $(OBJS_ogg) | ||
|
|
||
| $(TARGET_ogg_DEBUG): $(OBJS_ogg_DEBUG) | ||
| @mkdir -p $(dir $@) | ||
| ar cr $@ $(OBJS_ogg_DEBUG) | ||
|
|
||
| Release/ogg/%.o: ../../lib/libogg/% | ||
| @mkdir -p $(dir $@) | ||
| $(CC) -c $(CFLAGS_ogg) $< -o $@ | ||
|
|
||
| Debug/ogg/%.o: ../../lib/libogg/% | ||
| @mkdir -p $(dir $@) | ||
| $(CC) -c $(CFLAGS_DEBUG_ogg) $< -o $@ | ||
|
|
||
| release_ogg: $(TARGET_ogg) | ||
| debug_ogg: $(TARGET_ogg_DEBUG) | ||
|
|
||
| .PHONY: debug_ogg release_ogg | ||
|
|
||
| DEPS += $(patsubst %.o,%.d,$(OBJS_ogg)) | ||
| DEPS += $(patsubst %.o,%.d,$(OBJS_ogg_DEBUG)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| # I release this sample under the MIT license: free for any use, provided | ||
| # you hold me harmless from any such use you make, and you retain my | ||
| # copyright on the actual sources. | ||
| # Copyright 2005 Jon Watte. | ||
|
|
||
| LIBNAME := vorbis | ||
| SOURCES := \ | ||
| ../../lib/libvorbis/analysis.c \ | ||
| ../../lib/libvorbis/barkmel.c \ | ||
| ../../lib/libvorbis/bitrate.c \ | ||
| ../../lib/libvorbis/block.c \ | ||
| ../../lib/libvorbis/codebook.c \ | ||
| ../../lib/libvorbis/envelope.c \ | ||
| ../../lib/libvorbis/floor0.c \ | ||
| ../../lib/libvorbis/floor1.c \ | ||
| ../../lib/libvorbis/info.c \ | ||
| ../../lib/libvorbis/lookup.c \ | ||
| ../../lib/libvorbis/lpc.c \ | ||
| ../../lib/libvorbis/lsp.c \ | ||
| ../../lib/libvorbis/mapping0.c \ | ||
| ../../lib/libvorbis/mdct.c \ | ||
| ../../lib/libvorbis/psy.c \ | ||
| ../../lib/libvorbis/registry.c \ | ||
| ../../lib/libvorbis/res0.c \ | ||
| ../../lib/libvorbis/sharedbook.c \ | ||
| ../../lib/libvorbis/smallft.c \ | ||
| ../../lib/libvorbis/synthesis.c \ | ||
| ../../lib/libvorbis/tone.c \ | ||
| ../../lib/libvorbis/vorbisenc.c \ | ||
| ../../lib/libvorbis/vorbisfile.c \ | ||
| ../../lib/libvorbis/window.c \ | ||
|
|
||
| LDFLAGS_vorbis := -g -m32 | ||
|
|
||
| CFLAGS_vorbis := -MMD -I. -m32 -msse -mmmx -march=i686 | ||
|
|
||
| CFLAGS_vorbis += -I../../lib/libvorbis | ||
| CFLAGS_vorbis += -I../../lib/libvorbis/lib | ||
| CFLAGS_vorbis += -I../../lib/libvorbis/include | ||
| CFLAGS_vorbis += -I../../lib/libogg/include | ||
|
|
||
| CFLAGS_vorbis += -DUNICODE | ||
| CFLAGS_vorbis += -DLINUX | ||
|
|
||
| CFLAGS_DEBUG_vorbis := $(CFLAGS_vorbis) -ggdb | ||
| CFLAGS_DEBUG_vorbis += -DTORQUE_DEBUG | ||
| CFLAGS_DEBUG_vorbis += -DTORQUE_DEBUG_GUARD | ||
| CFLAGS_DEBUG_vorbis += -DTORQUE_NET_STATS | ||
|
|
||
| CFLAGS_vorbis += -O3 | ||
|
|
||
| CC := gcc | ||
| LD := gcc | ||
|
|
||
| TARGET_vorbis := lib/libvorbis.a | ||
| TARGET_vorbis_DEBUG := lib/libvorbis_DEBUG.a | ||
|
|
||
| LIB_TARGETS += $(TARGET_vorbis) | ||
| LIB_TARGETS_DEBUG += $(TARGET_vorbis_DEBUG) | ||
|
|
||
| OBJS_vorbis := $(patsubst ../../lib/libvorbis/%,Release/vorbis/%.o,$(SOURCES)) | ||
| OBJS_vorbis_DEBUG := $(patsubst ../../lib/libvorbis/%,Debug/vorbis/%.o,$(SOURCES)) | ||
|
|
||
| # Deriving the variable name from the target name is the secret sauce | ||
| # of the build system. | ||
| # | ||
| $(TARGET_vorbis): $(OBJS_vorbis) | ||
| @mkdir -p $(dir $@) | ||
| ar cr $@ $(OBJS_vorbis) | ||
|
|
||
| $(TARGET_vorbis_DEBUG): $(OBJS_vorbis_DEBUG) | ||
| @mkdir -p $(dir $@) | ||
| ar cr $@ $(OBJS_vorbis_DEBUG) | ||
|
|
||
| Release/vorbis/%.o: ../../lib/libvorbis/% | ||
| @mkdir -p $(dir $@) | ||
| $(CC) -c $(CFLAGS_vorbis) $< -o $@ | ||
|
|
||
| Debug/vorbis/%.o: ../../lib/libvorbis/% | ||
| @mkdir -p $(dir $@) | ||
| $(CC) -c $(CFLAGS_DEBUG_vorbis) $< -o $@ | ||
|
|
||
| release_vorbis: $(TARGET_vorbis) | ||
| debug_vorbis: $(TARGET_vorbis_DEBUG) | ||
|
|
||
| .PHONY: debug_vorbis release_vorbis | ||
|
|
||
| DEPS += $(patsubst %.o,%.d,$(OBJS_vorbis)) | ||
| DEPS += $(patsubst %.o,%.d,$(OBJS_vorbis_DEBUG)) |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.