Commit Graph

97 Commits

Author SHA1 Message Date
Arthur Moore 4d0dc64dff Create .gitignore file from SVN 2014-11-11 16:38:29 -05:00
squall-leonhart 48e1902818 removed <AdditionalOptions>/D_ST_MODEL/D_SECURE_SCL=0 %(AdditionalOptions)</AdditionalOptions> from the vcxproj
its redundant in VS2010 and VS2012, and seems to be a source of build errors in VS2012 for some reason.

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1181 a31d4220-a93d-0410-bf67-fe4944624d44
2013-03-29 08:31:17 +00:00
squall-leonhart 35f17bdb32 fixed nasm props again
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1170 a31d4220-a93d-0410-bf67-fe4944624d44
2013-03-03 03:20:28 +00:00
squall-leonhart 4c03f2e836 remove c_core from default preprocessors
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1166 a31d4220-a93d-0410-bf67-fe4944624d44
2013-02-10 16:32:22 +00:00
squall-leonhart a37e5d7e97 some changes to how SubWCRev works, resolving build issues when attempting to build from a source tar and adding it back to dependencies.
also deletes the wx build folder because its not going going anywhere fast on windows.

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1164 a31d4220-a93d-0410-bf67-fe4944624d44
2013-02-07 11:03:49 +00:00
squall-leonhart 49e936b283 Applied fixes to NormMatts r1150 fixes - V-Rally 3 working again
Re-added nasm.props to vs2008 build folder + changes to nasm.rules for spaces in paths.

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1161 a31d4220-a93d-0410-bf67-fe4944624d44
2013-02-04 06:15:53 +00:00
squall-leonhart 3f483bbce1 same as last commit on trunk
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1144 a31d4220-a93d-0410-bf67-fe4944624d44
2012-10-01 19:58:57 +00:00
squall-leonhart f7be31935d would help if i commit the file with /mp enabled instead of the one where i removed /mp from the advanced command line (don't need it on both pages)
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1120 a31d4220-a93d-0410-bf67-fe4944624d44
2012-09-06 15:41:59 +00:00
squall-leonhart 5a2da5176c >.> Shuffle2 was wrong.
that happens alot.
/mp switch enables the use of multiple cl.exe processes during assembling process, this cuts building vba-m times down by a nearly 3/4.

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1119 a31d4220-a93d-0410-bf67-fe4944624d44
2012-09-06 14:58:46 +00:00
squall-leonhart ad018c28b4 deleted vs2010_wx
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1103 a31d4220-a93d-0410-bf67-fe4944624d44
2012-07-12 06:38:19 +00:00
squall-leonhart 1dca418403 this is for the guys at emucr who can't tell a dummy project folder when they see one.
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1099 a31d4220-a93d-0410-bf67-fe4944624d44
2012-05-24 13:08:08 +00:00
squall-leonhart 31d1b72d7e for shuffle to play with
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1088 a31d4220-a93d-0410-bf67-fe4944624d44
2012-01-24 00:04:20 +00:00
squall-leonhart 35c18aff76 update FSF address
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1086 a31d4220-a93d-0410-bf67-fe4944624d44
2012-01-23 08:49:39 +00:00
squall-leonhart b90b9e403c remove the suo
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1076 a31d4220-a93d-0410-bf67-fe4944624d44
2012-01-21 00:20:05 +00:00
squall-leonhart 05d20571f7 shuffles magic mush...... trunk MSVC2010 buildfix
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1071 a31d4220-a93d-0410-bf67-fe4944624d44
2012-01-20 22:03:27 +00:00
squall-leonhart 9e1b0c4aee fex was fixed in the sln, but not the vcxproj :\
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1065 a31d4220-a93d-0410-bf67-fe4944624d44
2012-01-05 15:24:33 +00:00
squall-leonhart 541ecbda78 SubWCRev is no longer standalone, removed from dependencies and pointed the project files to find it via path
updated DevInfo.txt
applied khh's patch for gbalink.cpp though more changes are required to bring trunk up to building since the Wx patches

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1064 a31d4220-a93d-0410-bf67-fe4944624d44
2012-01-04 19:38:33 +00:00
squall-leonhart 1f861b2ad4 move fex into trunk
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1048 a31d4220-a93d-0410-bf67-fe4944624d44
2011-12-04 14:59:12 +00:00
squall-leonhart 4a7d17bc0b DrNach is the one who decided on keeping externals out of the trunk/branch tree's , and I agree with him on keeping dependencies out of them,
if you have a problem, take it up with him and be sure you have a compelling argument
The argument is invalid for source tarballs because 
1. we don't provide recent ones 90% of the time. 
2. those who do provide them include them. 
3. anyone dumb enough to distribute one without the required externs inclluded needs a head examination
4. FEX can be disabled, its not required if it is unwanted.
5. a wget type tool can be executed from the cmake script to pull any required externals that aren't included in the tarball.

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1044 a31d4220-a93d-0410-bf67-fe4944624d44
2011-12-04 10:13:57 +00:00
bgk 4127bc4504 ALL: Revert r1037:1041. Fix build.
FEX is not a common oss library thus it is not packaged by open source operating system distributors. That means if we ever want VBA-M to be packaged in OS distributions, we need to embed it in our main source tree, since fex is a dependency. 
The "dependencies" folder is outside of our main source tree thus it cant be used when building from a source tarball (for packaging).
zlib and SFML from the "dependencies" folder are only used when building the win32 port. All the other ports only use system libraries.
Having FEX somewhere within the "trunk" folder is REQUIRED for packaging, moving it elsewhere is NOT AN OPTION. Please live with it.


git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1042 a31d4220-a93d-0410-bf67-fe4944624d44
2011-12-04 07:27:25 +00:00
squall-leonhart b7ce4f250d correcting fex in the 2008 build files
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1041 a31d4220-a93d-0410-bf67-fe4944624d44
2011-12-04 03:03:18 +00:00
squall-leonhart b62c14753b trunk fex fixed
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1039 a31d4220-a93d-0410-bf67-fe4944624d44
2011-12-04 02:55:52 +00:00
bgk 7280c25517 ALL: Revert r1029. Fex is now back in the main source tree.
Please don't break things you can't fix.


git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1031 a31d4220-a93d-0410-bf67-fe4944624d44
2011-12-03 13:09:12 +00:00
squall-leonhart 82ffe9c0dc fex is a dependency, it should be, and now is in the folder with the rest of our dependencies (breaks cmake on both prewx and trunk)
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1029 a31d4220-a93d-0410-bf67-fe4944624d44
2011-06-30 09:21:20 +00:00
squall-leonhart e3b06a9684 Bugger unicode support, we can just convert multibyte to widestring using google cloud services and a bunch of midgets running in spinwheels.
Also enables whole program optimisation (funnily i was only doing linker time optimisation so it wasn't as good as it could be.)

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1013 a31d4220-a93d-0410-bf67-fe4944624d44
2011-04-26 07:25:16 +00:00
bgk dee05ff978 SVN: Applied proper properties to all files, mainly to get native end of lines.
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@975 a31d4220-a93d-0410-bf67-fe4944624d44
2011-02-19 21:33:53 +00:00
squall-leonhart 42a1e9c612 streamlined vcc directories some.
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@966 a31d4220-a93d-0410-bf67-fe4944624d44
2010-10-28 12:35:24 +00:00
squall-leonhart 2f9e6debf7 killed off 22 warnings by removing a command line override for zc:forscope.
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@959 a31d4220-a93d-0410-bf67-fe4944624d44
2010-10-03 13:21:22 +00:00
squall-leonhart 2b162d5f0b filters was named wrong for some reason O.o
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@957 a31d4220-a93d-0410-bf67-fe4944624d44
2010-10-03 12:53:51 +00:00
squall-leonhart c020769ba7 enable SSE optimisations in VCProj, intrinsics update nasm and revert shuffles changes to gb_apu_state.cpp.
i prefer warnings during compilation rather then a lack of function in the emulator, we can look at correcting the warnings in a less broken manner later.

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@955 a31d4220-a93d-0410-bf67-fe4944624d44
2010-09-10 11:31:31 +00:00
squall-leonhart 1cc90e5640 git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@951 a31d4220-a93d-0410-bf67-fe4944624d44 2010-08-29 17:19:19 +00:00
squall-leonhart 3a9af2a92b git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@950 a31d4220-a93d-0410-bf67-fe4944624d44 2010-08-29 17:18:58 +00:00
squall-leonhart 48b6f96e40 Removes NO_OAL from the project file to restore compiling to its full form. Specifying such an option should be done per user and should not be set by default.
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@947 a31d4220-a93d-0410-bf67-fe4944624d44
2010-06-30 15:24:19 +00:00
shuffle2 8916e188e0 fix the cmake/linux build
moves dependencies/File_Extractor-1.0.0 to trunk/fex - we can't expect people to have this lib, and fex has dropped support for the "fex_mini".

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@941 a31d4220-a93d-0410-bf67-fe4944624d44
2010-03-15 03:36:45 +00:00
shuffle2 841b6cfa77 update SubWCRev.exe to 1.6.7 (hey, no [false?] trojans now!)
put SubWCRev.exe in /dependencies to save non-windows folk some bandwidth.

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@938 a31d4220-a93d-0410-bf67-fe4944624d44
2010-02-26 23:21:18 +00:00
shuffle2 bfb217b5aa just quiet some warnings
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@937 a31d4220-a93d-0410-bf67-fe4944624d44
2010-02-24 21:33:18 +00:00
shuffle2 9b838b3298 update to File_Extractor-1.0.0
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@935 a31d4220-a93d-0410-bf67-fe4944624d44
2010-02-24 16:50:30 +00:00
shuffle2 e210e51edb remove stub /trunk/dependencies.
add source for all dependencies to /dependencies.
update vs2008 files accordingly.
if this is not a good compromise, just revert it - but try not to break the build this time.
dependencies/lpng140/scripts can probably be removed if no one sees a reason for it (some 225KB).

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@934 a31d4220-a93d-0410-bf67-fe4944624d44
2010-02-24 08:19:28 +00:00
shuffle2 c7007c0d39 revert vs2008 sln/vproj so they will actually load...
I'll let you deal with your own heathen rules.
don't commit my changes if you will royally screw it up.

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@933 a31d4220-a93d-0410-bf67-fe4944624d44
2010-02-24 06:53:47 +00:00
squall-leonhart d5d3f8aac8 git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@929 a31d4220-a93d-0410-bf67-fe4944624d44 2010-02-23 23:47:28 +00:00
spacy51 dccf885304 add a property file "per_user_settings.vsprops" where every developer can make his own changes that should not be part of the official distribution of VBA-M
(like excluding OpenAL, OpenGL, etc.)

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@927 a31d4220-a93d-0410-bf67-fe4944624d44
2009-11-29 20:58:29 +00:00
squall-leonhart c1607a0df5 cleaned up the vc10 project file
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@924 a31d4220-a93d-0410-bf67-fe4944624d44
2009-10-22 23:37:12 +00:00
spacy51 a1e7ecd735 fix compile errors with MSVC 2008
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@919 a31d4220-a93d-0410-bf67-fe4944624d44
2009-10-22 21:02:53 +00:00
squall-leonhart 7c9458af33 fixes Kodes patch, fixes u8h compiling on MSVC (Thanks for the help Nach) and includes preliminar vcxproject for MSVC2010
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@918 a31d4220-a93d-0410-bf67-fe4944624d44
2009-10-22 17:55:53 +00:00
spacy51 29808dbcc0 remove x64 support
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@900 a31d4220-a93d-0410-bf67-fe4944624d44
2009-08-29 16:36:50 +00:00
spacy51 5bb3c9b26b Add support for compiling x64 builds. These can not use the optimized x86 assembler code, which is used in the GBA core and several pixel filters.
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@899 a31d4220-a93d-0410-bf67-fe4944624d44
2009-08-28 16:57:04 +00:00
spacy51 c20581c102 Reduce build time by about 66% by using precompiled headers for MFC GUI code.
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@894 a31d4220-a93d-0410-bf67-fe4944624d44
2009-08-19 16:27:48 +00:00
spacy51 ab7a3f2652 Update DevInfo.txt.
Add the new SoundDriver.h file to the project file.


git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@891 a31d4220-a93d-0410-bf67-fe4944624d44
2009-08-16 14:54:35 +00:00
spacy51 d938186555 Change output file name to VisualBoyAdvance-M.exe
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@890 a31d4220-a93d-0410-bf67-fe4944624d44
2009-08-16 14:08:05 +00:00
squall-leonhart b388acba36 git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@884 a31d4220-a93d-0410-bf67-fe4944624d44 2009-08-10 09:15:07 +00:00