diff --git a/.vscode/configurationCache.log b/.vscode/configurationCache.log new file mode 100644 index 0000000..e014552 --- /dev/null +++ b/.vscode/configurationCache.log @@ -0,0 +1 @@ +{"buildTargets":["all","clean","debug"],"launchTargets":["/Users/raimonzamora/dev/proj/aee>aee()"],"customConfigurationProvider":{"workspaceBrowse":{"browsePath":["/Users/raimonzamora/dev/proj/aee"],"compilerArgs":["-lSDL2","-lSDL2_mixer","-o","aee","-lSDL2","-lSDL2_mixer","-o","aee","-lSDL2","-lSDL2_mixer","-o","aee","-g","-lSDL2","-lSDL2_mixer","-o","aee"],"compilerPath":"/usr/bin/g++","standard":"c++11","windowsSdkVersion":""},"fileIndex":[["/Users/raimonzamora/dev/proj/aee/*.cpp",{"uri":{"$mid":1,"fsPath":"/Users/raimonzamora/dev/proj/aee/*.cpp","path":"/Users/raimonzamora/dev/proj/aee/*.cpp","scheme":"file"},"configuration":{"defines":[],"standard":"c++11","includePath":[],"forcedInclude":[],"intelliSenseMode":"gcc-x64","compilerPath":"/usr/bin/g++","compilerArgs":["-g","-lSDL2","-lSDL2_mixer","-o","aee"],"windowsSdkVersion":""}}]]}} \ No newline at end of file diff --git a/.vscode/dryrun.log b/.vscode/dryrun.log new file mode 100644 index 0000000..b3ed2b0 --- /dev/null +++ b/.vscode/dryrun.log @@ -0,0 +1,5 @@ +make debug --dry-run --keep-going --print-directory +make: Entering directory `/Users/raimonzamora/dev/proj/aee' +g++ *.cpp -g -std=c++11 -lSDL2 -lSDL2_mixer -o aee +make: Leaving directory `/Users/raimonzamora/dev/proj/aee' + diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..760a59c --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,10 @@ +{ + "makefile.extensionOutputFolder": "./.vscode", + "makefile.launchConfigurations": [ + { + "cwd": "/Users/raimonzamora/dev/proj/aee", + "binaryPath": "/Users/raimonzamora/dev/proj/aee/aee", + "binaryArgs": [] + } + ] +} \ No newline at end of file diff --git a/.vscode/targets.log b/.vscode/targets.log new file mode 100644 index 0000000..6d5ff31 --- /dev/null +++ b/.vscode/targets.log @@ -0,0 +1,257 @@ +make all --print-data-base --no-builtin-variables --no-builtin-rules --question +# GNU Make 3.81 +# Copyright (C) 2006 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. +# There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# This program built for i386-apple-darwin11.3.0 + + +# Make data base, printed on Wed Sep 1 20:00:35 2021 + + +# Variables + +# automatic +/dev/null || echo /Developer)/Makefiles +# environment +VSCODE_CLI = 1 +# environment +VSCODE_CODE_CACHE_PATH = /Users/raimonzamora/Library/Application Support/Code/CachedData/3866c3553be8b268c8a7f8c0482c0c0177aa8bfa +# environment +LOGNAME = raimonzamora +# environment +APPLICATION_INSIGHTS_NO_DIAGNOSTIC_CHANNEL = true +# environment +VSCODE_HANDLES_UNCAUGHT_ERRORS = true +# automatic +^D = $(patsubst %/,%,$(dir $^)) +# environment +XPC_FLAGS = 0x0 +# default +MAKE = $(MAKE_COMMAND) +# default +MAKECMDGOALS := all +# environment +SHLVL = 3 +# default +MAKE_VERSION := 3.81 +# environment +USER = raimonzamora +# makefile +.DEFAULT_GOAL := all +# environment +TERM_SESSION_ID = 765A9C16-03F5-46AC-A0BE-B297B910335E +# automatic +%D = $(patsubst %/,%,$(dir $%)) +# default +MAKE_COMMAND := /Library/Developer/CommandLineTools/usr/bin/make +# environment +TERM_PROGRAM = Apple_Terminal +# default +.VARIABLES := +# environment +TMPDIR = /var/folders/jb/tqpp4m1j50d3gjsyry8hwypm0000gn/T/ +# automatic +*F = $(notdir $*) +# environment +VSCODE_IPC_HOOK = /Users/raimonzamora/Library/Application Support/Code/1.59.1-main.sock +# makefile +MAKEFLAGS = Rrqp +# environment +MFLAGS = -Rrqp +# automatic +*D = $(patsubst %/,%,$(dir $*)) +# environment +TERM_PROGRAM_VERSION = 440 +# environment +XPC_SERVICE_NAME = 0 +# automatic ++D = $(patsubst %/,%,$(dir $+)) +# automatic ++F = $(notdir $+) +# environment +__CF_USER_TEXT_ENCODING = 0x1F5:0x0:0x8 +# environment +COMMAND_MODE = unix2003 +# default +MAKEFILES := +# environment +VSCODE_BROWSER_CODE_LOADING = bypassHeatCheck +# automatic + - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIconFile - - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - LSApplicationCategoryType - public.app-category.arcade-games - LSMinimumSystemVersion - $(MACOSX_DEPLOYMENT_TARGET) - NSHumanReadableCopyright - Copyright © 2016 Raimon Zamora. All rights reserved. - NSPrincipalClass - NSApplication - - diff --git a/aee.sln b/aee.sln deleted file mode 100644 index 3352879..0000000 --- a/aee.sln +++ /dev/null @@ -1,22 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aee", "aee.vcxproj", "{CE606303-5AA1-41EF-BB2F-B11540AA5EA1}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CE606303-5AA1-41EF-BB2F-B11540AA5EA1}.Debug|Win32.ActiveCfg = Debug|Win32 - {CE606303-5AA1-41EF-BB2F-B11540AA5EA1}.Debug|Win32.Build.0 = Debug|Win32 - {CE606303-5AA1-41EF-BB2F-B11540AA5EA1}.Release|Win32.ActiveCfg = Release|Win32 - {CE606303-5AA1-41EF-BB2F-B11540AA5EA1}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/aee.vcxproj b/aee.vcxproj deleted file mode 100644 index 744eda6..0000000 --- a/aee.vcxproj +++ /dev/null @@ -1,120 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {CE606303-5AA1-41EF-BB2F-B11540AA5EA1} - Win32Proj - aee - 10.0.17134.0 - - - - Application - true - v141 - Unicode - - - Application - false - v141 - true - Unicode - - - - - - - - - - - - - true - C:\dev\lib\sdl2\include;$(IncludePath) - C:\dev\lib\sdl2\lib\x86;$(LibraryPath) - - - false - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - - - Windows - true - SDL2.lib;SDL2main.lib;SDL2_mixer.lib;%(AdditionalDependencies) - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/aee.vcxproj.filters b/aee.vcxproj.filters deleted file mode 100644 index 31f9f9c..0000000 --- a/aee.vcxproj.filters +++ /dev/null @@ -1,114 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/aee.xcodeproj/project.pbxproj b/aee.xcodeproj/project.pbxproj deleted file mode 100644 index cd7874b..0000000 --- a/aee.xcodeproj/project.pbxproj +++ /dev/null @@ -1,370 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - 02252FB81C764D2E002D1DA1 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02252FB71C764D2E002D1DA1 /* main.cpp */; }; - 02B01D591C767C1700CD186D /* SDL2_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 02B01D581C767C1700CD186D /* SDL2_image.framework */; }; - 02B01D5B1C767C2C00CD186D /* SDL2_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 02B01D5A1C767C2C00CD186D /* SDL2_mixer.framework */; }; - 02EA2BEF1C764B3800E5A247 /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 02EA2BEE1C764B3800E5A247 /* SDL2.framework */; }; - 02F8247B1C767CE2007AAE83 /* bola.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02F8245D1C767CE2007AAE83 /* bola.cpp */; }; - 02F8247C1C767CE2007AAE83 /* data.jrf in Resources */ = {isa = PBXBuildFile; fileRef = 02F8245F1C767CE2007AAE83 /* data.jrf */; }; - 02F8247D1C767CE2007AAE83 /* engendro.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02F824601C767CE2007AAE83 /* engendro.cpp */; }; - 02F8247E1C767CE2007AAE83 /* jdraw8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02F824631C767CE2007AAE83 /* jdraw8.cpp */; }; - 02F8247F1C767CE2007AAE83 /* jfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02F824651C767CE2007AAE83 /* jfile.cpp */; }; - 02F824801C767CE2007AAE83 /* jgame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02F824671C767CE2007AAE83 /* jgame.cpp */; }; - 02F824811C767CE2007AAE83 /* jinput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02F824691C767CE2007AAE83 /* jinput.cpp */; }; - 02F824821C767CE2007AAE83 /* jsound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02F8246B1C767CE2007AAE83 /* jsound.cpp */; }; - 02F824831C767CE2007AAE83 /* mapa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02F8246D1C767CE2007AAE83 /* mapa.cpp */; }; - 02F824841C767CE2007AAE83 /* marcador.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02F8246F1C767CE2007AAE83 /* marcador.cpp */; }; - 02F824851C767CE2007AAE83 /* modulegame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02F824711C767CE2007AAE83 /* modulegame.cpp */; }; - 02F824861C767CE2007AAE83 /* modulesequence.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02F824731C767CE2007AAE83 /* modulesequence.cpp */; }; - 02F824871C767CE2007AAE83 /* momia.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02F824751C767CE2007AAE83 /* momia.cpp */; }; - 02F824881C767CE2007AAE83 /* prota.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02F824771C767CE2007AAE83 /* prota.cpp */; }; - 02F824891C767CE2007AAE83 /* sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02F824791C767CE2007AAE83 /* sprite.cpp */; }; - 02F8248B1C772310007AAE83 /* gif.c in Sources */ = {isa = PBXBuildFile; fileRef = 02F8248A1C772310007AAE83 /* gif.c */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - 02252FB71C764D2E002D1DA1 /* main.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = main.cpp; sourceTree = ""; }; - 02B01D581C767C1700CD186D /* SDL2_image.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2_image.framework; path = ../../../../../Library/Frameworks/SDL2_image.framework; sourceTree = ""; }; - 02B01D5A1C767C2C00CD186D /* SDL2_mixer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2_mixer.framework; path = ../../../../../Library/Frameworks/SDL2_mixer.framework; sourceTree = ""; }; - 02CF35B91C7649C300180C9F /* aee.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = aee.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 02CF35C71C7649C300180C9F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 02EA2BEE1C764B3800E5A247 /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = ../../../../../Library/Frameworks/SDL2.framework; sourceTree = ""; }; - 02F8245D1C767CE2007AAE83 /* bola.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bola.cpp; sourceTree = ""; }; - 02F8245E1C767CE2007AAE83 /* bola.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bola.h; sourceTree = ""; }; - 02F8245F1C767CE2007AAE83 /* data.jrf */ = {isa = PBXFileReference; lastKnownFileType = file; path = data.jrf; sourceTree = ""; }; - 02F824601C767CE2007AAE83 /* engendro.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = engendro.cpp; sourceTree = ""; }; - 02F824611C767CE2007AAE83 /* engendro.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = engendro.h; sourceTree = ""; }; - 02F824621C767CE2007AAE83 /* info.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = info.h; sourceTree = ""; }; - 02F824631C767CE2007AAE83 /* jdraw8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jdraw8.cpp; sourceTree = ""; }; - 02F824641C767CE2007AAE83 /* jdraw8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jdraw8.h; sourceTree = ""; }; - 02F824651C767CE2007AAE83 /* jfile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jfile.cpp; sourceTree = ""; }; - 02F824661C767CE2007AAE83 /* jfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jfile.h; sourceTree = ""; }; - 02F824671C767CE2007AAE83 /* jgame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jgame.cpp; sourceTree = ""; }; - 02F824681C767CE2007AAE83 /* jgame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jgame.h; sourceTree = ""; }; - 02F824691C767CE2007AAE83 /* jinput.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jinput.cpp; sourceTree = ""; }; - 02F8246A1C767CE2007AAE83 /* jinput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jinput.h; sourceTree = ""; }; - 02F8246B1C767CE2007AAE83 /* jsound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jsound.cpp; sourceTree = ""; }; - 02F8246C1C767CE2007AAE83 /* jsound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jsound.h; sourceTree = ""; }; - 02F8246D1C767CE2007AAE83 /* mapa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mapa.cpp; sourceTree = ""; }; - 02F8246E1C767CE2007AAE83 /* mapa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mapa.h; sourceTree = ""; }; - 02F8246F1C767CE2007AAE83 /* marcador.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = marcador.cpp; sourceTree = ""; }; - 02F824701C767CE2007AAE83 /* marcador.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = marcador.h; sourceTree = ""; }; - 02F824711C767CE2007AAE83 /* modulegame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = modulegame.cpp; sourceTree = ""; }; - 02F824721C767CE2007AAE83 /* modulegame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = modulegame.h; sourceTree = ""; }; - 02F824731C767CE2007AAE83 /* modulesequence.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = modulesequence.cpp; sourceTree = ""; }; - 02F824741C767CE2007AAE83 /* modulesequence.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = modulesequence.h; sourceTree = ""; }; - 02F824751C767CE2007AAE83 /* momia.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = momia.cpp; sourceTree = ""; }; - 02F824761C767CE2007AAE83 /* momia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = momia.h; sourceTree = ""; }; - 02F824771C767CE2007AAE83 /* prota.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = prota.cpp; sourceTree = ""; }; - 02F824781C767CE2007AAE83 /* prota.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = prota.h; sourceTree = ""; }; - 02F824791C767CE2007AAE83 /* sprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sprite.cpp; sourceTree = ""; }; - 02F8247A1C767CE2007AAE83 /* sprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sprite.h; sourceTree = ""; }; - 02F8248A1C772310007AAE83 /* gif.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gif.c; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 02CF35B61C7649C300180C9F /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 02B01D5B1C767C2C00CD186D /* SDL2_mixer.framework in Frameworks */, - 02B01D591C767C1700CD186D /* SDL2_image.framework in Frameworks */, - 02EA2BEF1C764B3800E5A247 /* SDL2.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 02CF35B01C7649C300180C9F = { - isa = PBXGroup; - children = ( - 02F8248A1C772310007AAE83 /* gif.c */, - 02F8245D1C767CE2007AAE83 /* bola.cpp */, - 02F8245E1C767CE2007AAE83 /* bola.h */, - 02F8245F1C767CE2007AAE83 /* data.jrf */, - 02F824601C767CE2007AAE83 /* engendro.cpp */, - 02F824611C767CE2007AAE83 /* engendro.h */, - 02F824621C767CE2007AAE83 /* info.h */, - 02F824631C767CE2007AAE83 /* jdraw8.cpp */, - 02F824641C767CE2007AAE83 /* jdraw8.h */, - 02F824651C767CE2007AAE83 /* jfile.cpp */, - 02F824661C767CE2007AAE83 /* jfile.h */, - 02F824671C767CE2007AAE83 /* jgame.cpp */, - 02F824681C767CE2007AAE83 /* jgame.h */, - 02F824691C767CE2007AAE83 /* jinput.cpp */, - 02F8246A1C767CE2007AAE83 /* jinput.h */, - 02F8246B1C767CE2007AAE83 /* jsound.cpp */, - 02F8246C1C767CE2007AAE83 /* jsound.h */, - 02252FB71C764D2E002D1DA1 /* main.cpp */, - 02F8246D1C767CE2007AAE83 /* mapa.cpp */, - 02F8246E1C767CE2007AAE83 /* mapa.h */, - 02F8246F1C767CE2007AAE83 /* marcador.cpp */, - 02F824701C767CE2007AAE83 /* marcador.h */, - 02F824711C767CE2007AAE83 /* modulegame.cpp */, - 02F824721C767CE2007AAE83 /* modulegame.h */, - 02F824731C767CE2007AAE83 /* modulesequence.cpp */, - 02F824741C767CE2007AAE83 /* modulesequence.h */, - 02F824751C767CE2007AAE83 /* momia.cpp */, - 02F824761C767CE2007AAE83 /* momia.h */, - 02F824771C767CE2007AAE83 /* prota.cpp */, - 02F824781C767CE2007AAE83 /* prota.h */, - 02F824791C767CE2007AAE83 /* sprite.cpp */, - 02F8247A1C767CE2007AAE83 /* sprite.h */, - 02CF35C71C7649C300180C9F /* Info.plist */, - 02EA2BEE1C764B3800E5A247 /* SDL2.framework */, - 02B01D581C767C1700CD186D /* SDL2_image.framework */, - 02B01D5A1C767C2C00CD186D /* SDL2_mixer.framework */, - 02CF35BA1C7649C300180C9F /* Products */, - ); - sourceTree = ""; - }; - 02CF35BA1C7649C300180C9F /* Products */ = { - isa = PBXGroup; - children = ( - 02CF35B91C7649C300180C9F /* aee.app */, - ); - name = Products; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 02CF35B81C7649C300180C9F /* aee */ = { - isa = PBXNativeTarget; - buildConfigurationList = 02CF35CA1C7649C300180C9F /* Build configuration list for PBXNativeTarget "aee" */; - buildPhases = ( - 02CF35B51C7649C300180C9F /* Sources */, - 02CF35B61C7649C300180C9F /* Frameworks */, - 02CF35B71C7649C300180C9F /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = aee; - productName = aee; - productReference = 02CF35B91C7649C300180C9F /* aee.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 02CF35B11C7649C300180C9F /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0720; - ORGANIZATIONNAME = "Raimon Zamora"; - TargetAttributes = { - 02CF35B81C7649C300180C9F = { - CreatedOnToolsVersion = 7.2; - }; - }; - }; - buildConfigurationList = 02CF35B41C7649C300180C9F /* Build configuration list for PBXProject "aee" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 02CF35B01C7649C300180C9F; - productRefGroup = 02CF35BA1C7649C300180C9F /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 02CF35B81C7649C300180C9F /* aee */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 02CF35B71C7649C300180C9F /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 02F8247C1C767CE2007AAE83 /* data.jrf in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 02CF35B51C7649C300180C9F /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 02F824841C767CE2007AAE83 /* marcador.cpp in Sources */, - 02F824801C767CE2007AAE83 /* jgame.cpp in Sources */, - 02F824881C767CE2007AAE83 /* prota.cpp in Sources */, - 02F824851C767CE2007AAE83 /* modulegame.cpp in Sources */, - 02252FB81C764D2E002D1DA1 /* main.cpp in Sources */, - 02F824831C767CE2007AAE83 /* mapa.cpp in Sources */, - 02F8247D1C767CE2007AAE83 /* engendro.cpp in Sources */, - 02F824871C767CE2007AAE83 /* momia.cpp in Sources */, - 02F824861C767CE2007AAE83 /* modulesequence.cpp in Sources */, - 02F8247B1C767CE2007AAE83 /* bola.cpp in Sources */, - 02F824811C767CE2007AAE83 /* jinput.cpp in Sources */, - 02F8247E1C767CE2007AAE83 /* jdraw8.cpp in Sources */, - 02F8248B1C772310007AAE83 /* gif.c in Sources */, - 02F824821C767CE2007AAE83 /* jsound.cpp in Sources */, - 02F8247F1C767CE2007AAE83 /* jfile.cpp in Sources */, - 02F824891C767CE2007AAE83 /* sprite.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - 02CF35C81C7649C300180C9F /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - }; - name = Debug; - }; - 02CF35C91C7649C300180C9F /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = macosx; - }; - name = Release; - }; - 02CF35CB1C7649C300180C9F /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(LOCAL_LIBRARY_DIR)/Frameworks", - ); - HEADER_SEARCH_PATHS = ( - "$(LOCAL_LIBRARY_DIR)/Frameworks/SDL2.framework/headers", - "$(LOCAL_LIBRARY_DIR)/Frameworks/SDL2_image.framework/headers", - "$(LOCAL_LIBRARY_DIR)/Frameworks/SDL2_mixer.framework/headers", - ); - INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = net.jailers.aee; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 02CF35CC1C7649C300180C9F /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(LOCAL_LIBRARY_DIR)/Frameworks", - ); - HEADER_SEARCH_PATHS = ( - "$(LOCAL_LIBRARY_DIR)/Frameworks/SDL2.framework/headers", - "$(LOCAL_LIBRARY_DIR)/Frameworks/SDL2_image.framework/headers", - "$(LOCAL_LIBRARY_DIR)/Frameworks/SDL2_mixer.framework/headers", - ); - INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = net.jailers.aee; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 02CF35B41C7649C300180C9F /* Build configuration list for PBXProject "aee" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 02CF35C81C7649C300180C9F /* Debug */, - 02CF35C91C7649C300180C9F /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 02CF35CA1C7649C300180C9F /* Build configuration list for PBXNativeTarget "aee" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 02CF35CB1C7649C300180C9F /* Debug */, - 02CF35CC1C7649C300180C9F /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 02CF35B11C7649C300180C9F /* Project object */; -} diff --git a/gif.c b/gif.h similarity index 100% rename from gif.c rename to gif.h diff --git a/jdraw8.cpp b/jdraw8.cpp index a0195f7..6f8d69e 100755 --- a/jdraw8.cpp +++ b/jdraw8.cpp @@ -1,7 +1,7 @@ #include "jdraw8.h" #include "jfile.h" #include -#include "gif.c" +#include "gif.h" #ifdef GCWZERO #define SCREEN_WIDTH 320 diff --git a/jdraw8.h b/jdraw8.h index 71ceedd..b3da7f5 100755 --- a/jdraw8.h +++ b/jdraw8.h @@ -1,5 +1,5 @@ #pragma once -#include "SDL.h" +#include struct Color { Uint8 r; diff --git a/jfile.cpp b/jfile.cpp index 57b7c3f..5e409dc 100755 --- a/jfile.cpp +++ b/jfile.cpp @@ -1,5 +1,5 @@ #include "jfile.h" -#include "SDL.h" +#include #include #pragma pack(push,1) diff --git a/jgame.h b/jgame.h index 3dc2944..f4d54a0 100755 --- a/jgame.h +++ b/jgame.h @@ -1,5 +1,5 @@ #pragma once -#include "SDL.h" +#include void JG_Init(); diff --git a/jinput.h b/jinput.h index 4dc75d8..9d5f59c 100755 --- a/jinput.h +++ b/jinput.h @@ -1,5 +1,5 @@ #pragma once -#include "SDL.h" +#include void JI_DisableKeyboard(Uint32 time); diff --git a/jsound.h b/jsound.h index d7d64c0..90ad4ac 100755 --- a/jsound.h +++ b/jsound.h @@ -1,5 +1,5 @@ #pragma once -#include "SDL_mixer.h" +#include typedef Mix_Chunk JS_Sound; diff --git a/main.cpp b/main.cpp index de3195c..55a1c7d 100755 --- a/main.cpp +++ b/main.cpp @@ -8,13 +8,16 @@ #include "time.h" #include +/* #ifndef WIN32 #include #endif +*/ int main( int argc, char* args[] ) { -#ifdef WIN32 + JF_SetResourceFile("data.jrf"); +/*#ifdef WIN32 JF_SetResourceFile("data.jrf"); #else char res_file[255] = ""; @@ -27,7 +30,7 @@ int main( int argc, char* args[] ) { printf("ARXIU DE RECURSOS: %s\n", res_file); JF_SetResourceFile(res_file); #endif - +*/ srand( unsigned(time(NULL)) ); JG_Init(); diff --git a/makefile b/makefile index a42d118..2aa3d81 100755 --- a/makefile +++ b/makefile @@ -1,6 +1,9 @@ TARGET=aee all: - g++ -I/usr/include/SDL2 *.cpp -w -lSDL2 -lSDL2_mixer -o $(TARGET) + g++ *.cpp -std=c++11 -lSDL2 -lSDL2_mixer -o $(TARGET) + +debug: + g++ *.cpp -g -std=c++11 -lSDL2 -lSDL2_mixer -o $(TARGET) clean: rm -rf ./$(TARGET)