diff --git a/JGE/Makefile b/JGE/Makefile index 791234970..ab8d84fdc 100644 --- a/JGE/Makefile +++ b/JGE/Makefile @@ -1,118 +1,118 @@ -ifeq ($(MAKECMDGOALS),debug) -DEBUG = true -endif - - -GENERIC_OBJS = src/JApp.o src/JGBKFont.o \ - src/JGE.o src/JGui.o src/JLBFont.o \ - src/JGameObject.o src/JSpline.o src/JAnimator.o \ - src/JResourceManager.o src/JFileSystem.o \ - src/JParticle.o src/JParticleEmitter.o src/JParticleEffect.o \ - src/JParticleSystem.o \ - src/unzip/ioapi.o src/unzip/mztools.o src/unzip/unzip.o \ - src/JSprite.o src/Vector2D.o \ - src/tinyxml/tinystr.o src/tinyxml/tinyxml.o \ - src/tinyxml/tinyxmlparser.o src/tinyxml/tinyxmlerror.o \ - src/Encoding.o src/JTTFont.o \ - src/JMD2Model.o src/JOBJModel.o src/vram.o -PSP_OBJS = src/JGfx.o src/JSfx.o src/main.o -LINUX_OBJS = src/linux/JGfx.o src/linux/JSfx.o src/linuxmain.o - - -HGE_OBJS = src/hge/hgecolor.o src/hge/hgeparticle.o \ - src/hge/hgerect.o src/hge/hgevector.o \ - src/hge/hgedistort.o src/hge/hgefont.o - - -CXXFLAGS = -W -Wall -Werror - -ifdef DEBUG -CXXFLAGS += -ggdb3 -endif - -# Determination of target. -# TARGET_ARCHITECTURE variable will then be set to either linux or psp. - -RESULT = $(shell which psp-config) -ifeq ($(RESULT),) -DEFAULT_RULE = linux -TARGET_ARCHITECTURE = linux -else -DEFAULT_RULE = 3xx -TARGET_ARCHITECTURE = psp -TARGET_LIB = libjge300.a -endif - -ifeq ($(MAKECMDGOALS),linux) -DEFAULT_RULE = linux -TARGET_ARCHITECTURE = linux -endif -ifeq ($(MAKECMDGOALS),3xx) -DEFAULT_RULE = 3xx -TARGET_ARCHITECTURE = psp -TARGET_LIB = libjge300.a -endif -ifeq ($(MAKECMDGOALS),1xx) -DEFAULT_RULE = 1xx -OBJS = $(GENERIC_OBJS) $(PSP_OBJS) -TARGET_LIB = libjge100.a -TARGET_ARCHITECTURE = psp -CXXFLAGS += -DDEVHOOK -DPSPFW3XX -endif - -ifeq ($(TARGET_ARCHITECTURE),psp) -PSPSDK = $(shell psp-config --pspsdk-path) -PSPDIR = $(shell psp-config --psp-prefix) -OBJS = $(GENERIC_OBJS) $(PSP_OBJS) -TARGET_HGE = libhgetools.a -INCDIR = -I include/psp include/psp/freetype2 -CXXFLAGS += -G0 -LIBDIR = lib/psp -LIBS = -lgif -lfreetype -ljpeg -lpng -lz -lmikmod -lpsppower -lpspmpeg -lpspaudiocodec -lpspaudiolib -lpspaudio -lpspgum -lpspgu -lpsprtc -lm -lstdc++ -endif -ifeq ($(TARGET_ARCHITECTURE),linux) -OBJS = $(GENERIC_OBJS) $(LINUX_OBJS) -TARGET_LIB = libjge.a -TARGET_HGE = libhgetools.a -INCDIR = $(shell freetype-config --cflags) -CXXFLAGS += -DLINUX -LIBDIR = lib/linux -endif - -# Set definitive values for variables. -CXXFLAGS := $(INCDIR) $(CXXFLAGS) -LDFLAGS := $(LIBS) -TARGET_LIB := $(LIBDIR)/$(TARGET_LIB) -TARGET_HGE := $(LIBDIR)/$(TARGET_HGE) - -ifeq ($(TARGET_ARCHITECTURE),psp) -include $(PSPSDK)/lib/build.mak -endif - -all: $(DEFAULT_RULE) hge - -debug: $(DEFAULT_RULE) hge - -linux: $(TARGET_LIB) - @echo Making for Linux. - -3xx: $(TARGET_LIB) - @echo Making for 3xx. - -1xx: $(TARGET_LIB) - @echo Making for 1xx. - -install: $(TARGET_LIB) hge - -hge: $(TARGET_HGE) - -clean: - rm -f $(OBJS) $(HGE_OBJS) - -ifeq ($(TARGET_ARCHITECTURE),linux) -$(TARGET_LIB): $(OBJS) - ar r $(TARGET_LIB) $(OBJS) - -$(TARGET_HGE): $(HGE_OBJS) - ar r $(TARGET_HGE) $(HGE_OBJS) -endif +ifeq ($(MAKECMDGOALS),debug) +DEBUG = true +endif + + +GENERIC_OBJS = src/JApp.o src/JGBKFont.o \ + src/JGE.o src/JGui.o src/JLBFont.o \ + src/JGameObject.o src/JSpline.o src/JAnimator.o \ + src/JResourceManager.o src/JFileSystem.o \ + src/JParticle.o src/JParticleEmitter.o src/JParticleEffect.o \ + src/JParticleSystem.o \ + src/unzip/ioapi.o src/unzip/mztools.o src/unzip/unzip.o \ + src/JSprite.o src/Vector2D.o \ + src/tinyxml/tinystr.o src/tinyxml/tinyxml.o \ + src/tinyxml/tinyxmlparser.o src/tinyxml/tinyxmlerror.o \ + src/Encoding.o src/JTTFont.o \ + src/JMD2Model.o src/JOBJModel.o src/vram.o +PSP_OBJS = src/JGfx.o src/JSfx.o src/main.o +LINUX_OBJS = src/linux/JGfx.o src/linux/JSfx.o src/linuxmain.o + + +HGE_OBJS = src/hge/hgecolor.o src/hge/hgeparticle.o \ + src/hge/hgerect.o src/hge/hgevector.o \ + src/hge/hgedistort.o src/hge/hgefont.o + + +CXXFLAGS = -W -Wall -Werror -Wno-unused + +ifdef DEBUG +CXXFLAGS += -ggdb3 +endif + +# Determination of target. +# TARGET_ARCHITECTURE variable will then be set to either linux or psp. + +RESULT = $(shell which psp-config) +ifeq ($(RESULT),) +DEFAULT_RULE = linux +TARGET_ARCHITECTURE = linux +else +DEFAULT_RULE = 3xx +TARGET_ARCHITECTURE = psp +TARGET_LIB = libjge300.a +endif + +ifeq ($(MAKECMDGOALS),linux) +DEFAULT_RULE = linux +TARGET_ARCHITECTURE = linux +endif +ifeq ($(MAKECMDGOALS),3xx) +DEFAULT_RULE = 3xx +TARGET_ARCHITECTURE = psp +TARGET_LIB = libjge300.a +endif +ifeq ($(MAKECMDGOALS),1xx) +DEFAULT_RULE = 1xx +OBJS = $(GENERIC_OBJS) $(PSP_OBJS) +TARGET_LIB = libjge100.a +TARGET_ARCHITECTURE = psp +CXXFLAGS += -DDEVHOOK -DPSPFW3XX +endif + +ifeq ($(TARGET_ARCHITECTURE),psp) +PSPSDK = $(shell psp-config --pspsdk-path) +PSPDIR = $(shell psp-config --psp-prefix) +OBJS = $(GENERIC_OBJS) $(PSP_OBJS) +TARGET_HGE = libhgetools.a +INCDIR = -I include/psp include/psp/freetype2 +CXXFLAGS += -G0 +LIBDIR = lib/psp +LIBS = -lgif -lfreetype -ljpeg -lpng -lz -lmikmod -lpsppower -lpspmpeg -lpspaudiocodec -lpspaudiolib -lpspaudio -lpspgum -lpspgu -lpsprtc -lm -lstdc++ +endif +ifeq ($(TARGET_ARCHITECTURE),linux) +OBJS = $(GENERIC_OBJS) $(LINUX_OBJS) +TARGET_LIB = libjge.a +TARGET_HGE = libhgetools.a +INCDIR = $(shell freetype-config --cflags) +CXXFLAGS += -DLINUX +LIBDIR = lib/linux +endif + +# Set definitive values for variables. +CXXFLAGS := $(INCDIR) $(CXXFLAGS) +LDFLAGS := $(LIBS) +TARGET_LIB := $(LIBDIR)/$(TARGET_LIB) +TARGET_HGE := $(LIBDIR)/$(TARGET_HGE) + +ifeq ($(TARGET_ARCHITECTURE),psp) +include $(PSPSDK)/lib/build.mak +endif + +all: $(DEFAULT_RULE) hge + +debug: $(DEFAULT_RULE) hge + +linux: $(TARGET_LIB) + @echo Making for Linux. + +3xx: $(TARGET_LIB) + @echo Making for 3xx. + +1xx: $(TARGET_LIB) + @echo Making for 1xx. + +install: $(TARGET_LIB) hge + +hge: $(TARGET_HGE) + +clean: + rm -f $(OBJS) $(HGE_OBJS) + +ifeq ($(TARGET_ARCHITECTURE),linux) +$(TARGET_LIB): $(OBJS) + ar r $(TARGET_LIB) $(OBJS) + +$(TARGET_HGE): $(HGE_OBJS) + ar r $(TARGET_HGE) $(HGE_OBJS) +endif diff --git a/JGE/include/JTypes.h b/JGE/include/JTypes.h index 2b5cf67e0..328b05407 100644 --- a/JGE/include/JTypes.h +++ b/JGE/include/JTypes.h @@ -211,7 +211,7 @@ typedef uint32_t u32; #define FRAME_BUFFER_SIZE FRAME_BUFFER_WIDTH*SCREEN_HEIGHT*PIXEL_SIZE #define SLICE_SIZE_F 64.0f - typedef unsigned long DWORD; + typedef unsigned int DWORD; #define BLEND_ZERO 0x1000 #define BLEND_ONE 0x1002 diff --git a/JGE/lib/win/jge_debug.lib b/JGE/lib/win/jge_debug.lib index 27aeb026e..5361ae908 100644 Binary files a/JGE/lib/win/jge_debug.lib and b/JGE/lib/win/jge_debug.lib differ diff --git a/JGE/src/JFileSystem.cpp b/JGE/src/JFileSystem.cpp index beffcb464..66ae62d9c 100644 --- a/JGE/src/JFileSystem.cpp +++ b/JGE/src/JFileSystem.cpp @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------------- -#ifndef LINUX +#ifdef WIN32 #pragma warning(disable : 4786) #endif diff --git a/JGE/src/JGBKFont.cpp b/JGE/src/JGBKFont.cpp index d73da4ded..3df563843 100644 --- a/JGE/src/JGBKFont.cpp +++ b/JGE/src/JGBKFont.cpp @@ -138,7 +138,7 @@ bool JGBKFont::Init(const char* engFileName, const char* chnFileName, int fontsi #if defined (WIN32) || defined (LINUX) #else -void SwizzlePlot(u8* out, PIXEL_TYPE color, int i, int j, unsigned int width, unsigned int height) +void SwizzlePlot(u8* out, PIXEL_TYPE color, int i, int j, unsigned int width) { unsigned int rowblocks = (width >> 4); @@ -232,9 +232,9 @@ int JGBKFont::PreCacheChar(const BYTE *ch) mCharBuffer[y*mFontSize+x] = ARGB(0,0,0,0); #else if ((bits & bitMask) != 0) - SwizzlePlot(pTexture, ARGB(255,255,255,255), x*PIXEL_SIZE, y, mTexture->mTexWidth*PIXEL_SIZE, mCacheImageHeight); + SwizzlePlot(pTexture, ARGB(255,255,255,255), x*PIXEL_SIZE, y, mTexture->mTexWidth*PIXEL_SIZE); else - SwizzlePlot(pTexture, ARGB(0,0,0,0), x*PIXEL_SIZE, y, mTexture->mTexWidth*PIXEL_SIZE, mCacheImageHeight); + SwizzlePlot(pTexture, ARGB(0,0,0,0), x*PIXEL_SIZE, y, mTexture->mTexWidth*PIXEL_SIZE); #endif bitMask >>= 1; x++; @@ -272,7 +272,7 @@ int JGBKFont::PreCacheChar(const BYTE *ch) #if defined (WIN32) || defined (LINUX) mCharBuffer[y*mFontSize+x] = ARGB(0,0,0,0); #else - SwizzlePlot(pTexture, ARGB(0,0,0,0), x*PIXEL_SIZE, y, mTexture->mTexWidth*PIXEL_SIZE, mCacheImageHeight); + SwizzlePlot(pTexture, ARGB(0,0,0,0), x*PIXEL_SIZE, y, mTexture->mTexWidth*PIXEL_SIZE); #endif x++; } @@ -293,9 +293,9 @@ int JGBKFont::PreCacheChar(const BYTE *ch) mCharBuffer[y*mFontSize+x] = ARGB(0,0,0,0); #else if ((bits & bitMask) != 0) - SwizzlePlot(pTexture, ARGB(255,255,255,255), x*PIXEL_SIZE, y, mTexture->mTexWidth*PIXEL_SIZE, mCacheImageHeight); + SwizzlePlot(pTexture, ARGB(255,255,255,255), x*PIXEL_SIZE, y, mTexture->mTexWidth*PIXEL_SIZE); else - SwizzlePlot(pTexture, ARGB(0,0,0,0), x*PIXEL_SIZE, y, mTexture->mTexWidth*PIXEL_SIZE, mCacheImageHeight); + SwizzlePlot(pTexture, ARGB(0,0,0,0), x*PIXEL_SIZE, y, mTexture->mTexWidth*PIXEL_SIZE); #endif x++; bitMask >>= 1; @@ -311,7 +311,7 @@ int JGBKFont::PreCacheChar(const BYTE *ch) #if defined (WIN32) || defined (LINUX) mCharBuffer[y*mFontSize+x] = ARGB(0,0,0,0); #else - SwizzlePlot(pTexture, ARGB(0,0,0,0), x*PIXEL_SIZE, y, mTexture->mTexWidth*PIXEL_SIZE, mCacheImageHeight); + SwizzlePlot(pTexture, ARGB(0,0,0,0), x*PIXEL_SIZE, y, mTexture->mTexWidth*PIXEL_SIZE); #endif x++; } diff --git a/JGE/src/JGfx.cpp b/JGE/src/JGfx.cpp index 7ea95869f..dbd9b6112 100644 --- a/JGE/src/JGfx.cpp +++ b/JGE/src/JGfx.cpp @@ -38,7 +38,7 @@ extern "C" { static unsigned int __attribute__((aligned(16))) list[262144]; -extern void SwizzlePlot(u8* out, PIXEL_TYPE color, int i, int j, unsigned int width, unsigned int height); +extern void SwizzlePlot(u8* out, PIXEL_TYPE color, int i, int j, unsigned int width); void Swap(float *a, float *b) @@ -119,11 +119,12 @@ JTexture::~JTexture() void JTexture::UpdateBits(int x, int y, int width, int height, PIXEL_TYPE* bits) { + //TODO: Is this normal that width is not used ?? for (int i=0;iColors[c].Red, palette->Colors[c].Green, palette->Colors[c].Blue) #define gif_color32(c) ARGB(255,palette->Colors[c].Red,palette->Colors[c].Green, palette->Colors[c].Blue) GifRecordType RecordType; diff --git a/JGE/src/JTTFont.cpp b/JGE/src/JTTFont.cpp index d41098d6a..64094e756 100644 --- a/JGE/src/JTTFont.cpp +++ b/JGE/src/JTTFont.cpp @@ -19,7 +19,7 @@ #include #include FT_FREETYPE_H -#ifndef LINUX +#ifdef WIN32 #pragma comment( lib, "freetype.lib" ) #endif @@ -30,7 +30,7 @@ #ifndef WIN32 // in JGBKFont.cpp -extern void SwizzlePlot(u8* out, PIXEL_TYPE color, int i, int j, unsigned int width, unsigned int height); +extern void SwizzlePlot(u8* out, PIXEL_TYPE color, int i, int j, unsigned int width); #endif @@ -288,7 +288,7 @@ int JTTFont::PreCacheChar(u16 ch, u16 cachedCode) { for (int j=0;j